@galacean/effects-core 2.1.0-alpha.0 → 2.1.0-alpha.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/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 +348 -45
- package/dist/index.js.map +1 -1
- package/dist/index.mjs +348 -45
- package/dist/index.mjs.map +1 -1
- package/dist/math/value-getter.d.ts +4 -1
- package/dist/plugins/particle/particle-mesh.d.ts +14 -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/dist/texture/texture.d.ts +2 -2
- package/package.json +1 -1
package/dist/index.js
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.2
|
|
7
7
|
*/
|
|
8
8
|
|
|
9
9
|
'use strict';
|
|
@@ -4689,7 +4689,13 @@ function getDirectStore(target) {
|
|
|
4689
4689
|
}
|
|
4690
4690
|
};
|
|
4691
4691
|
_proto.dispose = function dispose() {
|
|
4692
|
-
this.
|
|
4692
|
+
if (this.isEnableCalled) {
|
|
4693
|
+
this.disable();
|
|
4694
|
+
}
|
|
4695
|
+
if (this.isAwakeCalled) {
|
|
4696
|
+
this.isAwakeCalled = false;
|
|
4697
|
+
this.onDestroy();
|
|
4698
|
+
}
|
|
4693
4699
|
if (this.item) {
|
|
4694
4700
|
removeItem(this.item.components, this);
|
|
4695
4701
|
}
|
|
@@ -8346,7 +8352,7 @@ var seed$8 = 1;
|
|
|
8346
8352
|
* 通过 URL 创建 Texture 对象。
|
|
8347
8353
|
* @param url - 要创建的 Texture URL
|
|
8348
8354
|
* @since 2.0.0
|
|
8349
|
-
*/ Texture.fromImage = function fromImage(url, engine) {
|
|
8355
|
+
*/ Texture.fromImage = function fromImage(url, engine, options) {
|
|
8350
8356
|
return _async_to_generator(function() {
|
|
8351
8357
|
var image, texture;
|
|
8352
8358
|
return __generator(this, function(_state) {
|
|
@@ -8358,12 +8364,13 @@ var seed$8 = 1;
|
|
|
8358
8364
|
];
|
|
8359
8365
|
case 1:
|
|
8360
8366
|
image = _state.sent();
|
|
8361
|
-
texture = Texture.create(engine, {
|
|
8367
|
+
texture = Texture.create(engine, _extends({
|
|
8362
8368
|
sourceType: exports.TextureSourceType.image,
|
|
8363
8369
|
image: image,
|
|
8370
|
+
target: glContext.TEXTURE_2D,
|
|
8364
8371
|
id: generateGUID(),
|
|
8365
8372
|
flipY: true
|
|
8366
|
-
});
|
|
8373
|
+
}, options));
|
|
8367
8374
|
texture.initialize();
|
|
8368
8375
|
return [
|
|
8369
8376
|
2,
|
|
@@ -10030,8 +10037,13 @@ var RandomValue = /*#__PURE__*/ function(ValueGetter) {
|
|
|
10030
10037
|
this.min = props[0];
|
|
10031
10038
|
this.max = props[1];
|
|
10032
10039
|
};
|
|
10033
|
-
_proto.getValue = function getValue(time) {
|
|
10034
|
-
|
|
10040
|
+
_proto.getValue = function getValue(time, seed) {
|
|
10041
|
+
var randomSeed = seed != null ? seed : Math.random();
|
|
10042
|
+
return this.min + randomSeed * (this.max - this.min);
|
|
10043
|
+
};
|
|
10044
|
+
_proto.getIntegrateValue = function getIntegrateValue(t0, t1, timeScale) {
|
|
10045
|
+
var seed = timeScale != null ? timeScale : 1.0;
|
|
10046
|
+
return (this.min + seed * (this.max - this.min)) * (t1 - t0);
|
|
10035
10047
|
};
|
|
10036
10048
|
_proto.toUniform = function toUniform() {
|
|
10037
10049
|
return new Float32Array([
|
|
@@ -10290,15 +10302,19 @@ var BezierCurve = /*#__PURE__*/ function(ValueGetter) {
|
|
|
10290
10302
|
points: points,
|
|
10291
10303
|
timeInterval: timeInterval,
|
|
10292
10304
|
valueInterval: valueInterval,
|
|
10293
|
-
curve: curve
|
|
10305
|
+
curve: curve,
|
|
10306
|
+
timeStart: Number(s.x),
|
|
10307
|
+
timeEnd: Number(e.x)
|
|
10294
10308
|
};
|
|
10295
10309
|
}
|
|
10296
10310
|
};
|
|
10297
10311
|
_proto.getValue = function getValue(time) {
|
|
10298
10312
|
var result = 0;
|
|
10299
10313
|
var keyTimeData = Object.keys(this.curveMap);
|
|
10300
|
-
var keyTimeStart =
|
|
10301
|
-
var keyTimeEnd =
|
|
10314
|
+
var keyTimeStart = this.curveMap[keyTimeData[0]].timeStart;
|
|
10315
|
+
var keyTimeEnd = this.curveMap[keyTimeData[keyTimeData.length - 1]].timeEnd;
|
|
10316
|
+
// const keyTimeStart = Number(keyTimeData[0].split('&')[0]);
|
|
10317
|
+
// const keyTimeEnd = Number(keyTimeData[keyTimeData.length - 1].split('&')[1]);
|
|
10302
10318
|
if (time <= keyTimeStart) {
|
|
10303
10319
|
return this.getCurveValue(keyTimeData[0], keyTimeStart);
|
|
10304
10320
|
}
|
|
@@ -10306,7 +10322,9 @@ var BezierCurve = /*#__PURE__*/ function(ValueGetter) {
|
|
|
10306
10322
|
return this.getCurveValue(keyTimeData[keyTimeData.length - 1], keyTimeEnd);
|
|
10307
10323
|
}
|
|
10308
10324
|
for(var i = 0; i < keyTimeData.length; i++){
|
|
10309
|
-
var
|
|
10325
|
+
var xMin = this.curveMap[keyTimeData[i]].timeStart;
|
|
10326
|
+
var xMax = this.curveMap[keyTimeData[i]].timeEnd;
|
|
10327
|
+
// const [xMin, xMax] = keyTimeData[i].split('&');
|
|
10310
10328
|
if (time >= Number(xMin) && time < Number(xMax)) {
|
|
10311
10329
|
result = this.getCurveValue(keyTimeData[i], time);
|
|
10312
10330
|
break;
|
|
@@ -10319,12 +10337,13 @@ var BezierCurve = /*#__PURE__*/ function(ValueGetter) {
|
|
|
10319
10337
|
var time = (t1 - t0) / ts;
|
|
10320
10338
|
var result = 0;
|
|
10321
10339
|
var keyTimeData = Object.keys(this.curveMap);
|
|
10322
|
-
var keyTimeStart =
|
|
10340
|
+
var keyTimeStart = this.curveMap[keyTimeData[0]].timeStart;
|
|
10323
10341
|
if (time <= keyTimeStart) {
|
|
10324
10342
|
return 0;
|
|
10325
10343
|
}
|
|
10326
10344
|
for(var i = 0; i < keyTimeData.length; i++){
|
|
10327
|
-
var
|
|
10345
|
+
var xMin = this.curveMap[keyTimeData[i]].timeStart;
|
|
10346
|
+
var xMax = this.curveMap[keyTimeData[i]].timeEnd;
|
|
10328
10347
|
if (time >= Number(xMax)) {
|
|
10329
10348
|
result += ts * this.getCurveIntegrateValue(keyTimeData[i], Number(xMax));
|
|
10330
10349
|
}
|
|
@@ -11558,7 +11577,7 @@ var itemFrag = "precision highp float;varying vec4 vColor;varying vec2 vTexCoord
|
|
|
11558
11577
|
|
|
11559
11578
|
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";
|
|
11560
11579
|
|
|
11561
|
-
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}}";
|
|
11580
|
+
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}}";
|
|
11562
11581
|
|
|
11563
11582
|
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}";
|
|
11564
11583
|
|
|
@@ -16536,6 +16555,7 @@ function getTrailMeshShader(trails, particleMaxCount, name, gpuCapability, env)
|
|
|
16536
16555
|
_proto.onUpdate = function onUpdate(dt) {
|
|
16537
16556
|
var time = this.particleMesh.time;
|
|
16538
16557
|
this.particleMesh.mesh.material.setVector4("uParams", new Vector4(time, this.item.duration, 0, 0));
|
|
16558
|
+
this.particleMesh.onUpdate(dt);
|
|
16539
16559
|
};
|
|
16540
16560
|
_proto.render = function render(renderer) {
|
|
16541
16561
|
for(var _iterator = _create_for_of_iterator_helper_loose(this.meshes), _step; !(_step = _iterator()).done;){
|
|
@@ -16550,6 +16570,7 @@ function getTrailMeshShader(trails, particleMaxCount, name, gpuCapability, env)
|
|
|
16550
16570
|
};
|
|
16551
16571
|
_proto.updateTime = function updateTime(now, delta) {
|
|
16552
16572
|
this.particleMesh.time = now;
|
|
16573
|
+
// this.particleMesh.onUpdate(delta);
|
|
16553
16574
|
if (this.trailMesh) {
|
|
16554
16575
|
this.trailMesh.time = now;
|
|
16555
16576
|
this.trailMesh.onUpdate(delta);
|
|
@@ -16648,6 +16669,9 @@ exports.ParticleSystem = /*#__PURE__*/ function(Component) {
|
|
|
16648
16669
|
_proto.isFrozen = function isFrozen() {
|
|
16649
16670
|
return this.frozen;
|
|
16650
16671
|
};
|
|
16672
|
+
_proto.isEnded = function isEnded() {
|
|
16673
|
+
return this.ended;
|
|
16674
|
+
};
|
|
16651
16675
|
_proto.initEmitterTransform = function initEmitterTransform() {
|
|
16652
16676
|
var position = this.item.transform.position.clone();
|
|
16653
16677
|
var rotation = this.item.transform.rotation.clone();
|
|
@@ -17593,11 +17617,8 @@ function randomArrItem(arr, keepArr) {
|
|
|
17593
17617
|
}
|
|
17594
17618
|
var particleSystem = this.particleSystem;
|
|
17595
17619
|
if (particleSystem) {
|
|
17596
|
-
// TODO: [1.31] @十弦 验证 https://github.com/galacean/effects-runtime/commit/3e7d73d37b7d98c2a25e4544e80e928b17801ccd#diff-fae062f28caf3771cfedd3a20dc22f9749bd054c7541bf2fd50a9a5e413153d4
|
|
17597
|
-
// particleSystem.setParentTransform(parentItem.transform);
|
|
17598
|
-
particleSystem.setVisible(true);
|
|
17599
17620
|
var deltaTime = context.deltaTime;
|
|
17600
|
-
if (this.time < particleSystem.item.duration && particleSystem.
|
|
17621
|
+
if (this.time >= 0 && this.time < particleSystem.item.duration && particleSystem.isEnded()) {
|
|
17601
17622
|
particleSystem.reset();
|
|
17602
17623
|
}
|
|
17603
17624
|
if (Math.abs(this.time - this.lastTime) < 0.001) {
|
|
@@ -17656,6 +17677,13 @@ var particleUniformTypeMap = {
|
|
|
17656
17677
|
var ParticleMesh = /*#__PURE__*/ function() {
|
|
17657
17678
|
function ParticleMesh(engine, props) {
|
|
17658
17679
|
this.particleCount = 0;
|
|
17680
|
+
this.cachedVelocity = new Vector3();
|
|
17681
|
+
this.cachedRotationVector3 = new Vector3();
|
|
17682
|
+
this.cachedRotationMatrix = new Matrix3();
|
|
17683
|
+
this.cachedLinearMove = new Vector3();
|
|
17684
|
+
this.tempMatrix3 = new Matrix3();
|
|
17685
|
+
this.tempVector3 = new Vector3();
|
|
17686
|
+
this.VERT_MAX_KEY_FRAME_COUNT = 0;
|
|
17659
17687
|
var _engine_renderer;
|
|
17660
17688
|
var env = ((_engine_renderer = engine.renderer) != null ? _engine_renderer : {}).env;
|
|
17661
17689
|
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;
|
|
@@ -17874,6 +17902,7 @@ var ParticleMesh = /*#__PURE__*/ function() {
|
|
|
17874
17902
|
"FRAG_MAX_KEY_FRAME_COUNT",
|
|
17875
17903
|
fragmentKeyFrameMeta.max
|
|
17876
17904
|
]);
|
|
17905
|
+
this.VERT_MAX_KEY_FRAME_COUNT = vertexKeyFrameMeta.max;
|
|
17877
17906
|
var fragment = particleFrag;
|
|
17878
17907
|
var originalVertex = "#define LOOKUP_TEXTURE_CURVE " + vertex_lookup_texture + "\n" + particleVert;
|
|
17879
17908
|
var vertex = originalVertex;
|
|
@@ -17982,6 +18011,7 @@ var ParticleMesh = /*#__PURE__*/ function() {
|
|
|
17982
18011
|
this.orbitalVelOverLifetime = orbitalVelOverLifetime;
|
|
17983
18012
|
this.orbitalVelOverLifetime = orbitalVelOverLifetime;
|
|
17984
18013
|
this.gravityModifier = gravityModifier;
|
|
18014
|
+
this.rotationOverLifetime = rotationOverLifetime;
|
|
17985
18015
|
this.maxCount = maxCount;
|
|
17986
18016
|
// this.duration = duration;
|
|
17987
18017
|
this.textureOffsets = textureFlip ? [
|
|
@@ -18046,15 +18076,230 @@ var ParticleMesh = /*#__PURE__*/ function() {
|
|
|
18046
18076
|
// @ts-expect-error
|
|
18047
18077
|
geometry.setIndexData(new index.constructor(0));
|
|
18048
18078
|
};
|
|
18079
|
+
_proto.onUpdate = function onUpdate(dt) {
|
|
18080
|
+
var aPosArray = this.geometry.getAttributeData("aPos"); // vector3
|
|
18081
|
+
var aVelArray = this.geometry.getAttributeData("aVel"); // vector3
|
|
18082
|
+
var aOffsetArray = this.geometry.getAttributeData("aOffset");
|
|
18083
|
+
var aRotArray = this.geometry.getAttributeData("aRot"); // vector3
|
|
18084
|
+
var aSeedArray = this.geometry.getAttributeData("aSeed"); // float
|
|
18085
|
+
// const uParams = this.mesh.material.getVector4('uParams');
|
|
18086
|
+
// if (!uParams) {
|
|
18087
|
+
// return;
|
|
18088
|
+
// }
|
|
18089
|
+
var localTime = this.time;
|
|
18090
|
+
var particleCount = Math.ceil(aPosArray.length / 12);
|
|
18091
|
+
// calculate particle translation
|
|
18092
|
+
var aTranslationArray = this.geometry.getAttributeData("aTranslation");
|
|
18093
|
+
if (aTranslationArray.length < particleCount * 3) {
|
|
18094
|
+
aTranslationArray = this.expandArray(aTranslationArray, particleCount * 3);
|
|
18095
|
+
}
|
|
18096
|
+
var velocity = this.cachedVelocity;
|
|
18097
|
+
for(var i = 0; i < particleCount; i++){
|
|
18098
|
+
var velOffset = i * 12 + 3;
|
|
18099
|
+
velocity.set(aVelArray[velOffset], aVelArray[velOffset + 1], aVelArray[velOffset + 2]);
|
|
18100
|
+
this.calculateTranslation(velocity, aOffsetArray[i * 4 + 2], localTime, aOffsetArray[i * 4 + 3]);
|
|
18101
|
+
var aTranslationOffset = i * 3;
|
|
18102
|
+
if (aOffsetArray[i * 4 + 2] < localTime) {
|
|
18103
|
+
var translation = velocity.multiply(dt / 1000);
|
|
18104
|
+
aTranslationArray[aTranslationOffset] += translation.x;
|
|
18105
|
+
aTranslationArray[aTranslationOffset + 1] += translation.y;
|
|
18106
|
+
aTranslationArray[aTranslationOffset + 2] += translation.z;
|
|
18107
|
+
}
|
|
18108
|
+
}
|
|
18109
|
+
this.geometry.setAttributeData("aTranslation", aTranslationArray);
|
|
18110
|
+
// calculate particle rotation
|
|
18111
|
+
var aRotationArray = this.geometry.getAttributeData("aRotation0");
|
|
18112
|
+
if (aRotationArray.length < particleCount * 9) {
|
|
18113
|
+
aRotationArray = this.expandArray(aRotationArray, particleCount * 9);
|
|
18114
|
+
}
|
|
18115
|
+
for(var i1 = 0; i1 < particleCount; i1++){
|
|
18116
|
+
var time = localTime - aOffsetArray[i1 * 4 + 2];
|
|
18117
|
+
var duration = aOffsetArray[i1 * 4 + 3];
|
|
18118
|
+
var life = clamp$1(time / duration, 0.0, 1.0);
|
|
18119
|
+
var aRotOffset = i1 * 8;
|
|
18120
|
+
var aRot = this.cachedRotationVector3.set(aRotArray[aRotOffset], aRotArray[aRotOffset + 1], aRotArray[aRotOffset + 2]);
|
|
18121
|
+
var aSeed = aSeedArray[i1 * 8 + 3];
|
|
18122
|
+
var aRotation = this.transformFromRotation(aRot, life, duration, aSeed, this.cachedRotationMatrix);
|
|
18123
|
+
var aRotationOffset = i1 * 9;
|
|
18124
|
+
var matrixArray = aRotation.toArray();
|
|
18125
|
+
aRotationArray.set(matrixArray, aRotationOffset);
|
|
18126
|
+
}
|
|
18127
|
+
this.geometry.setAttributeData("aRotation0", aRotationArray);
|
|
18128
|
+
// calculate linear movement
|
|
18129
|
+
var aLinearMoveArray = this.geometry.getAttributeData("aLinearMove");
|
|
18130
|
+
if (aLinearMoveArray.length < particleCount * 3) {
|
|
18131
|
+
aLinearMoveArray = this.expandArray(aLinearMoveArray, particleCount * 3);
|
|
18132
|
+
}
|
|
18133
|
+
var linearMove = this.cachedLinearMove;
|
|
18134
|
+
for(var i2 = 0; i2 < particleCount; i2++){
|
|
18135
|
+
var time1 = localTime - aOffsetArray[i2 * 4 + 2];
|
|
18136
|
+
var duration1 = aOffsetArray[i2 * 4 + 3];
|
|
18137
|
+
// const life = math.clamp(time / duration, 0.0, 1.0);
|
|
18138
|
+
var aSeed1 = aSeedArray[i2 * 8 + 3];
|
|
18139
|
+
linearMove.setZero();
|
|
18140
|
+
this.calLinearMov(time1, duration1, aSeed1, linearMove);
|
|
18141
|
+
var aLinearMoveOffset = i2 * 3;
|
|
18142
|
+
aLinearMoveArray[aLinearMoveOffset] = linearMove.x;
|
|
18143
|
+
aLinearMoveArray[aLinearMoveOffset + 1] = linearMove.y;
|
|
18144
|
+
aLinearMoveArray[aLinearMoveOffset + 2] = linearMove.z;
|
|
18145
|
+
}
|
|
18146
|
+
this.geometry.setAttributeData("aLinearMove", aLinearMoveArray);
|
|
18147
|
+
};
|
|
18049
18148
|
_proto.minusTime = function minusTime(time) {
|
|
18050
|
-
var
|
|
18051
|
-
|
|
18052
|
-
|
|
18053
|
-
data[i + 2] -= time;
|
|
18149
|
+
var aOffset = this.geometry.getAttributeData("aOffset");
|
|
18150
|
+
for(var i = 0; i < aOffset.length; i += 4){
|
|
18151
|
+
aOffset[i + 2] -= time;
|
|
18054
18152
|
}
|
|
18055
|
-
this.geometry.setAttributeData("aOffset",
|
|
18153
|
+
this.geometry.setAttributeData("aOffset", aOffset);
|
|
18056
18154
|
this.time -= time;
|
|
18057
18155
|
};
|
|
18156
|
+
_proto.calculateTranslation = function calculateTranslation(velocity, t0, t1, duration) {
|
|
18157
|
+
var uAcceleration = this.mesh.material.getVector4("uAcceleration");
|
|
18158
|
+
var uGravityModifierValue = this.mesh.material.getVector4("uGravityModifierValue");
|
|
18159
|
+
if (!uAcceleration || !uGravityModifierValue) {
|
|
18160
|
+
return velocity;
|
|
18161
|
+
}
|
|
18162
|
+
var dt = t1 - t0; // 相对delay的时间
|
|
18163
|
+
var d = this.gravityModifier.getIntegrateValue(0, dt, duration);
|
|
18164
|
+
var acc = this.tempVector3.set(uAcceleration.x * d, uAcceleration.y * d, uAcceleration.z * d);
|
|
18165
|
+
// speedIntegrate = speedOverLifetime.getIntegrateValue(0, time, duration);
|
|
18166
|
+
if (this.speedOverLifetime) {
|
|
18167
|
+
// dt / dur 归一化
|
|
18168
|
+
var speed = this.speedOverLifetime.getValue(dt / duration);
|
|
18169
|
+
return velocity.multiply(speed).add(acc);
|
|
18170
|
+
}
|
|
18171
|
+
return velocity.add(acc);
|
|
18172
|
+
};
|
|
18173
|
+
_proto.transformFromRotation = function transformFromRotation(rot, life, dur, aSeed, result) {
|
|
18174
|
+
var rotation = rot;
|
|
18175
|
+
if (!this.rotationOverLifetime) {
|
|
18176
|
+
return result.setZero();
|
|
18177
|
+
}
|
|
18178
|
+
if (this.rotationOverLifetime.asRotation) {
|
|
18179
|
+
// Adjust rotation based on the specified lifetime components
|
|
18180
|
+
if (this.rotationOverLifetime.x) {
|
|
18181
|
+
if (_instanceof1(this.rotationOverLifetime.x, RandomValue)) {
|
|
18182
|
+
rotation.x += this.rotationOverLifetime.x.getValue(life, aSeed);
|
|
18183
|
+
} else {
|
|
18184
|
+
rotation.x += this.rotationOverLifetime.x.getValue(life);
|
|
18185
|
+
}
|
|
18186
|
+
}
|
|
18187
|
+
if (this.rotationOverLifetime.y) {
|
|
18188
|
+
if (_instanceof1(this.rotationOverLifetime.y, RandomValue)) {
|
|
18189
|
+
rotation.y += this.rotationOverLifetime.y.getValue(life, aSeed);
|
|
18190
|
+
} else {
|
|
18191
|
+
rotation.y += this.rotationOverLifetime.y.getValue(life);
|
|
18192
|
+
}
|
|
18193
|
+
}
|
|
18194
|
+
if (this.rotationOverLifetime.z) {
|
|
18195
|
+
if (_instanceof1(this.rotationOverLifetime.z, RandomValue)) {
|
|
18196
|
+
rotation.z += this.rotationOverLifetime.z.getValue(life, aSeed);
|
|
18197
|
+
} else {
|
|
18198
|
+
rotation.z += this.rotationOverLifetime.z.getValue(life);
|
|
18199
|
+
}
|
|
18200
|
+
}
|
|
18201
|
+
} else {
|
|
18202
|
+
// Adjust rotation based on the specified lifetime components
|
|
18203
|
+
if (this.rotationOverLifetime.x) {
|
|
18204
|
+
if (_instanceof1(this.rotationOverLifetime.x, RandomValue)) {
|
|
18205
|
+
rotation.x += this.rotationOverLifetime.x.getIntegrateValue(0.0, life, aSeed) * dur;
|
|
18206
|
+
} else {
|
|
18207
|
+
rotation.x += this.rotationOverLifetime.x.getIntegrateValue(0.0, life, dur) * dur;
|
|
18208
|
+
}
|
|
18209
|
+
}
|
|
18210
|
+
if (this.rotationOverLifetime.y) {
|
|
18211
|
+
if (_instanceof1(this.rotationOverLifetime.y, RandomValue)) {
|
|
18212
|
+
rotation.y += this.rotationOverLifetime.y.getIntegrateValue(0.0, life, aSeed) * dur;
|
|
18213
|
+
} else {
|
|
18214
|
+
rotation.y += this.rotationOverLifetime.y.getIntegrateValue(0.0, life, dur) * dur;
|
|
18215
|
+
}
|
|
18216
|
+
}
|
|
18217
|
+
if (this.rotationOverLifetime.z) {
|
|
18218
|
+
if (_instanceof1(this.rotationOverLifetime.z, RandomValue)) {
|
|
18219
|
+
rotation.z += this.rotationOverLifetime.z.getIntegrateValue(0.0, life, aSeed) * dur;
|
|
18220
|
+
} else {
|
|
18221
|
+
rotation.z += this.rotationOverLifetime.z.getIntegrateValue(0.0, life, dur) * dur;
|
|
18222
|
+
}
|
|
18223
|
+
}
|
|
18224
|
+
}
|
|
18225
|
+
// If the rotation vector is zero, return the identity matrix
|
|
18226
|
+
if (rotation.dot(rotation) === 0.0) {
|
|
18227
|
+
return result.identity();
|
|
18228
|
+
}
|
|
18229
|
+
// Return the rotation matrix derived from the rotation vector
|
|
18230
|
+
return this.mat3FromRotation(rotation, result);
|
|
18231
|
+
};
|
|
18232
|
+
_proto.mat3FromRotation = function mat3FromRotation(rotation, result) {
|
|
18233
|
+
var d2r = Math.PI / 180;
|
|
18234
|
+
var rotationXD2r = rotation.x * d2r;
|
|
18235
|
+
var rotationYD2r = rotation.y * d2r;
|
|
18236
|
+
var rotationZD2r = rotation.z * d2r;
|
|
18237
|
+
var sinRX = Math.sin(rotationXD2r);
|
|
18238
|
+
var sinRY = Math.sin(rotationYD2r);
|
|
18239
|
+
var sinRZ = Math.sin(rotationZD2r);
|
|
18240
|
+
var cosRX = Math.cos(rotationXD2r);
|
|
18241
|
+
var cosRY = Math.cos(rotationYD2r);
|
|
18242
|
+
var cosRZ = Math.cos(rotationZD2r);
|
|
18243
|
+
// rotZ * rotY * rotX
|
|
18244
|
+
result.set(cosRZ, -sinRZ, 0., sinRZ, cosRZ, 0., 0., 0., 1.); //rotZ
|
|
18245
|
+
result.multiply(this.tempMatrix3.set(cosRY, 0., sinRY, 0., 1., 0., -sinRY, 0, cosRY)); //rotY
|
|
18246
|
+
result.multiply(this.tempMatrix3.set(1., 0., 0., 0, cosRX, -sinRX, 0., sinRX, cosRX)); //rotX
|
|
18247
|
+
return result;
|
|
18248
|
+
};
|
|
18249
|
+
_proto.calLinearMov = function calLinearMov(time, duration, aSeed, result) {
|
|
18250
|
+
var mov = result;
|
|
18251
|
+
var lifetime = time / duration;
|
|
18252
|
+
if (!this.linearVelOverLifetime || !this.linearVelOverLifetime.enabled) {
|
|
18253
|
+
return mov;
|
|
18254
|
+
}
|
|
18255
|
+
if (this.linearVelOverLifetime.asMovement) {
|
|
18256
|
+
if (this.linearVelOverLifetime.x) {
|
|
18257
|
+
if (_instanceof1(this.linearVelOverLifetime.x, RandomValue)) {
|
|
18258
|
+
mov.x = this.linearVelOverLifetime.x.getValue(lifetime, aSeed);
|
|
18259
|
+
} else {
|
|
18260
|
+
mov.x = this.linearVelOverLifetime.x.getValue(lifetime);
|
|
18261
|
+
}
|
|
18262
|
+
}
|
|
18263
|
+
if (this.linearVelOverLifetime.y) {
|
|
18264
|
+
if (_instanceof1(this.linearVelOverLifetime.y, RandomValue)) {
|
|
18265
|
+
mov.y = this.linearVelOverLifetime.y.getValue(lifetime, aSeed);
|
|
18266
|
+
} else {
|
|
18267
|
+
mov.y = this.linearVelOverLifetime.y.getValue(lifetime);
|
|
18268
|
+
}
|
|
18269
|
+
}
|
|
18270
|
+
if (this.linearVelOverLifetime.z) {
|
|
18271
|
+
if (_instanceof1(this.linearVelOverLifetime.z, RandomValue)) {
|
|
18272
|
+
mov.z = this.linearVelOverLifetime.z.getValue(lifetime, aSeed);
|
|
18273
|
+
} else {
|
|
18274
|
+
mov.z = this.linearVelOverLifetime.z.getValue(lifetime);
|
|
18275
|
+
}
|
|
18276
|
+
}
|
|
18277
|
+
} else {
|
|
18278
|
+
// Adjust rotation based on the specified lifetime components
|
|
18279
|
+
if (this.linearVelOverLifetime.x) {
|
|
18280
|
+
if (_instanceof1(this.linearVelOverLifetime.x, RandomValue)) {
|
|
18281
|
+
mov.x = this.linearVelOverLifetime.x.getIntegrateValue(0.0, time, aSeed);
|
|
18282
|
+
} else {
|
|
18283
|
+
mov.x = this.linearVelOverLifetime.x.getIntegrateValue(0.0, time, duration);
|
|
18284
|
+
}
|
|
18285
|
+
}
|
|
18286
|
+
if (this.linearVelOverLifetime.y) {
|
|
18287
|
+
if (_instanceof1(this.linearVelOverLifetime.y, RandomValue)) {
|
|
18288
|
+
mov.y = this.linearVelOverLifetime.y.getIntegrateValue(0.0, time, aSeed);
|
|
18289
|
+
} else {
|
|
18290
|
+
mov.y = this.linearVelOverLifetime.y.getIntegrateValue(0.0, time, duration);
|
|
18291
|
+
}
|
|
18292
|
+
}
|
|
18293
|
+
if (this.linearVelOverLifetime.z) {
|
|
18294
|
+
if (_instanceof1(this.linearVelOverLifetime.z, RandomValue)) {
|
|
18295
|
+
mov.z = this.linearVelOverLifetime.z.getIntegrateValue(0.0, time, aSeed);
|
|
18296
|
+
} else {
|
|
18297
|
+
mov.z = this.linearVelOverLifetime.z.getIntegrateValue(0.0, time, duration);
|
|
18298
|
+
}
|
|
18299
|
+
}
|
|
18300
|
+
}
|
|
18301
|
+
return mov;
|
|
18302
|
+
};
|
|
18058
18303
|
_proto.removePoint = function removePoint(index) {
|
|
18059
18304
|
if (index < this.particleCount) {
|
|
18060
18305
|
this.geometry.setAttributeSubData("aOffset", index * 16, new Float32Array(16));
|
|
@@ -18078,7 +18323,8 @@ var ParticleMesh = /*#__PURE__*/ function() {
|
|
|
18078
18323
|
var pointData = {
|
|
18079
18324
|
aPos: new Float32Array(48),
|
|
18080
18325
|
aRot: new Float32Array(32),
|
|
18081
|
-
aOffset: new Float32Array(16)
|
|
18326
|
+
aOffset: new Float32Array(16),
|
|
18327
|
+
aTranslation: new Float32Array(12)
|
|
18082
18328
|
};
|
|
18083
18329
|
var useSprite = this.useSprite;
|
|
18084
18330
|
if (useSprite) {
|
|
@@ -18187,6 +18433,11 @@ var ParticleMesh = /*#__PURE__*/ function() {
|
|
|
18187
18433
|
geometry.setDrawCount(this.particleCount * 6);
|
|
18188
18434
|
}
|
|
18189
18435
|
};
|
|
18436
|
+
_proto.expandArray = function expandArray(array, newSize) {
|
|
18437
|
+
var newArr = new Float32Array(newSize);
|
|
18438
|
+
newArr.set(array);
|
|
18439
|
+
return newArr;
|
|
18440
|
+
};
|
|
18190
18441
|
return ParticleMesh;
|
|
18191
18442
|
}();
|
|
18192
18443
|
var gl2UniformSlots = [
|
|
@@ -18256,6 +18507,32 @@ function generateGeometryProps(maxVertex, useSprite, name) {
|
|
|
18256
18507
|
size: 4,
|
|
18257
18508
|
stride: 4 * bpe,
|
|
18258
18509
|
data: new Float32Array(0)
|
|
18510
|
+
},
|
|
18511
|
+
aTranslation: {
|
|
18512
|
+
size: 3,
|
|
18513
|
+
data: new Float32Array(0)
|
|
18514
|
+
},
|
|
18515
|
+
aLinearMove: {
|
|
18516
|
+
size: 3,
|
|
18517
|
+
data: new Float32Array(0)
|
|
18518
|
+
},
|
|
18519
|
+
aRotation0: {
|
|
18520
|
+
size: 3,
|
|
18521
|
+
offset: 0,
|
|
18522
|
+
stride: 9 * bpe,
|
|
18523
|
+
data: new Float32Array(0)
|
|
18524
|
+
},
|
|
18525
|
+
aRotation1: {
|
|
18526
|
+
size: 3,
|
|
18527
|
+
offset: 3 * bpe,
|
|
18528
|
+
stride: 9 * bpe,
|
|
18529
|
+
dataSource: "aRotation0"
|
|
18530
|
+
},
|
|
18531
|
+
aRotation2: {
|
|
18532
|
+
size: 3,
|
|
18533
|
+
offset: 6 * bpe,
|
|
18534
|
+
stride: 9 * bpe,
|
|
18535
|
+
dataSource: "aRotation0"
|
|
18259
18536
|
}
|
|
18260
18537
|
};
|
|
18261
18538
|
if (useSprite) {
|
|
@@ -19462,6 +19739,18 @@ function compareTracks(a, b) {
|
|
|
19462
19739
|
}
|
|
19463
19740
|
}
|
|
19464
19741
|
};
|
|
19742
|
+
_proto.showItems = function showItems() {
|
|
19743
|
+
for(var _iterator = _create_for_of_iterator_helper_loose(this.items), _step; !(_step = _iterator()).done;){
|
|
19744
|
+
var item = _step.value;
|
|
19745
|
+
item.setVisible(true);
|
|
19746
|
+
}
|
|
19747
|
+
};
|
|
19748
|
+
_proto.hideItems = function hideItems() {
|
|
19749
|
+
for(var _iterator = _create_for_of_iterator_helper_loose(this.items), _step; !(_step = _iterator()).done;){
|
|
19750
|
+
var item = _step.value;
|
|
19751
|
+
item.setVisible(false);
|
|
19752
|
+
}
|
|
19753
|
+
};
|
|
19465
19754
|
_proto.onDestroy = function onDestroy() {
|
|
19466
19755
|
if (this.item.composition) {
|
|
19467
19756
|
if (this.items) {
|
|
@@ -19572,6 +19861,34 @@ function compareTracks(a, b) {
|
|
|
19572
19861
|
return CompositionComponent;
|
|
19573
19862
|
}(Behaviour);
|
|
19574
19863
|
|
|
19864
|
+
var SubCompositionMixerPlayable = /*#__PURE__*/ function(Playable) {
|
|
19865
|
+
_inherits(SubCompositionMixerPlayable, Playable);
|
|
19866
|
+
function SubCompositionMixerPlayable() {
|
|
19867
|
+
return Playable.apply(this, arguments);
|
|
19868
|
+
}
|
|
19869
|
+
var _proto = SubCompositionMixerPlayable.prototype;
|
|
19870
|
+
_proto.processFrame = function processFrame(context) {
|
|
19871
|
+
var boundObject = context.output.getUserData();
|
|
19872
|
+
if (!_instanceof1(boundObject, CompositionComponent)) {
|
|
19873
|
+
return;
|
|
19874
|
+
}
|
|
19875
|
+
var compositionComponent = boundObject;
|
|
19876
|
+
var hasInput = false;
|
|
19877
|
+
for(var i = 0; i < this.getInputCount(); i++){
|
|
19878
|
+
if (this.getInputWeight(i) > 0) {
|
|
19879
|
+
hasInput = true;
|
|
19880
|
+
break;
|
|
19881
|
+
}
|
|
19882
|
+
}
|
|
19883
|
+
if (hasInput) {
|
|
19884
|
+
compositionComponent.showItems();
|
|
19885
|
+
} else {
|
|
19886
|
+
compositionComponent.hideItems();
|
|
19887
|
+
}
|
|
19888
|
+
};
|
|
19889
|
+
return SubCompositionMixerPlayable;
|
|
19890
|
+
}(Playable);
|
|
19891
|
+
|
|
19575
19892
|
exports.SubCompositionTrack = /*#__PURE__*/ function(TrackAsset) {
|
|
19576
19893
|
_inherits(SubCompositionTrack, TrackAsset);
|
|
19577
19894
|
function SubCompositionTrack() {
|
|
@@ -19584,6 +19901,9 @@ exports.SubCompositionTrack = /*#__PURE__*/ function(TrackAsset) {
|
|
|
19584
19901
|
}
|
|
19585
19902
|
return parentBinding.getComponent(CompositionComponent);
|
|
19586
19903
|
};
|
|
19904
|
+
_proto.createTrackMixer = function createTrackMixer(graph) {
|
|
19905
|
+
return new SubCompositionMixerPlayable(graph);
|
|
19906
|
+
};
|
|
19587
19907
|
return SubCompositionTrack;
|
|
19588
19908
|
}(exports.TrackAsset);
|
|
19589
19909
|
exports.SubCompositionTrack = __decorate([
|
|
@@ -23679,22 +23999,6 @@ var seed = 1;
|
|
|
23679
23999
|
this.timeout = timeout;
|
|
23680
24000
|
};
|
|
23681
24001
|
/**
|
|
23682
|
-
* 根据用户传入的参数修改场景数据
|
|
23683
|
-
*/ _proto.updateSceneData = function updateSceneData(items) {
|
|
23684
|
-
var variables = this.options.variables;
|
|
23685
|
-
if (!variables || Object.keys(variables).length === 0) {
|
|
23686
|
-
return;
|
|
23687
|
-
}
|
|
23688
|
-
items.forEach(function(item) {
|
|
23689
|
-
if (item.type === ItemType.text) {
|
|
23690
|
-
var textVariable = variables[item.name];
|
|
23691
|
-
if (textVariable) {
|
|
23692
|
-
item.content.options.text = textVariable;
|
|
23693
|
-
}
|
|
23694
|
-
}
|
|
23695
|
-
});
|
|
23696
|
-
};
|
|
23697
|
-
/**
|
|
23698
24002
|
* 场景创建,通过 json 创建出场景对象,并进行提前编译等工作
|
|
23699
24003
|
* @param url - json 的 URL 链接或者 json 对象
|
|
23700
24004
|
* @param renderer - renderer 对象,用于获取管理、编译 shader 及 GPU 上下文的参数
|
|
@@ -23821,7 +24125,6 @@ var seed = 1;
|
|
|
23821
24125
|
for(i1 = 0; i1 < scene.images.length; i1++){
|
|
23822
24126
|
scene.textureOptions[i1].image = scene.images[i1];
|
|
23823
24127
|
}
|
|
23824
|
-
_this.updateSceneData(scene.jsonScene.items);
|
|
23825
24128
|
_state.label = 5;
|
|
23826
24129
|
case 5:
|
|
23827
24130
|
return [
|
|
@@ -23878,7 +24181,6 @@ var seed = 1;
|
|
|
23878
24181
|
];
|
|
23879
24182
|
case 10:
|
|
23880
24183
|
loadedTextures = _state.sent();
|
|
23881
|
-
_this.updateSceneData(jsonScene.items);
|
|
23882
24184
|
scene = {
|
|
23883
24185
|
timeInfos: timeInfos,
|
|
23884
24186
|
url: url,
|
|
@@ -25212,6 +25514,7 @@ var LateUpdateTickData = /*#__PURE__*/ function(TickData) {
|
|
|
25212
25514
|
* 跳到指定时间点(不做任何播放行为)
|
|
25213
25515
|
* @param time - 相对 startTime 的时间
|
|
25214
25516
|
*/ _proto.setTime = function setTime(time) {
|
|
25517
|
+
var speed = this.speed;
|
|
25215
25518
|
var pause = this.paused;
|
|
25216
25519
|
if (pause) {
|
|
25217
25520
|
this.resume();
|
|
@@ -25220,7 +25523,9 @@ var LateUpdateTickData = /*#__PURE__*/ function(TickData) {
|
|
|
25220
25523
|
this.rootComposition.onStart();
|
|
25221
25524
|
this.rootComposition.isStartCalled = true;
|
|
25222
25525
|
}
|
|
25526
|
+
this.setSpeed(1);
|
|
25223
25527
|
this.forwardTime(time + this.startTime);
|
|
25528
|
+
this.setSpeed(speed);
|
|
25224
25529
|
if (pause) {
|
|
25225
25530
|
this.pause();
|
|
25226
25531
|
}
|
|
@@ -25232,7 +25537,6 @@ var LateUpdateTickData = /*#__PURE__*/ function(TickData) {
|
|
|
25232
25537
|
/**
|
|
25233
25538
|
* 前进合成到指定时间
|
|
25234
25539
|
* @param time - 相对0时刻的时间
|
|
25235
|
-
* @param skipRender - 是否跳过渲染
|
|
25236
25540
|
*/ _proto.forwardTime = function forwardTime(time) {
|
|
25237
25541
|
var deltaTime = time * 1000 - this.rootComposition.time * 1000;
|
|
25238
25542
|
var reverse = deltaTime < 0;
|
|
@@ -25282,7 +25586,6 @@ var LateUpdateTickData = /*#__PURE__*/ function(TickData) {
|
|
|
25282
25586
|
/**
|
|
25283
25587
|
* 合成更新,针对所有 item 的更新
|
|
25284
25588
|
* @param deltaTime - 更新的时间步长
|
|
25285
|
-
* @param skipRender - 是否需要渲染
|
|
25286
25589
|
*/ _proto.update = function update(deltaTime) {
|
|
25287
25590
|
if (!this.assigned || this.paused) {
|
|
25288
25591
|
return;
|
|
@@ -27785,7 +28088,7 @@ registerPlugin("sprite", SpriteLoader, exports.VFXItem, true);
|
|
|
27785
28088
|
registerPlugin("particle", ParticleLoader, exports.VFXItem, true);
|
|
27786
28089
|
registerPlugin("cal", CalculateLoader, exports.VFXItem, true);
|
|
27787
28090
|
registerPlugin("interact", InteractLoader, exports.VFXItem, true);
|
|
27788
|
-
var version = "2.1.0-alpha.
|
|
28091
|
+
var version = "2.1.0-alpha.2";
|
|
27789
28092
|
logger.info("Core version: " + version + ".");
|
|
27790
28093
|
|
|
27791
28094
|
exports.AbstractPlugin = AbstractPlugin;
|