@galacean/effects-core 2.1.0-alpha.3 → 2.1.0-alpha.5

package/dist/composition.d.ts

@@ -150,10 +150,6 @@ export declare class Composition extends EventEmitter<CompositionEvent<Compositi
      * 合成的相机对象
      */
     readonly camera: Camera;
-    /**
-     * 合成全局时间
-     */
-    globalTime: number;
     /**
      * 后处理渲染配置
      */

package/dist/index.js

@@ -3,7 +3,7 @@
  * Description: Galacean Effects runtime core for the web
  * Author: Ant Group CO., Ltd.
  * Contributors: 燃然,飂兮,十弦,云垣,茂安,意绮
- * Version: v2.1.0-alpha.3
+ * Version: v2.1.0-alpha.5
  */
 
 'use strict';
@@ -4255,6 +4255,9 @@ var MaterialBlending;
     /**
      * 自发光
      */ RenderMode3D["emissive"] = "emissive";
+    /**
+     * 漫反射
+     */ RenderMode3D["diffuse"] = "diffuse";
 })(RenderMode3D || (RenderMode3D = {}));
 
 var TextOverflow;
@@ -10307,10 +10310,11 @@ var BezierCurve = /*#__PURE__*/ function(ValueGetter) {
                 timeEnd: Number(e.x)
             };
         }
+        this.keyTimeData = Object.keys(this.curveMap);
     };
     _proto.getValue = function getValue(time) {
         var result = 0;
-        var keyTimeData = Object.keys(this.curveMap);
+        var keyTimeData = this.keyTimeData;
         var keyTimeStart = this.curveMap[keyTimeData[0]].timeStart;
         var keyTimeEnd = this.curveMap[keyTimeData[keyTimeData.length - 1]].timeEnd;
         // const keyTimeStart = Number(keyTimeData[0].split('&')[0]);
@@ -11587,7 +11591,7 @@ var valueDefine = "#ifdef SHADER_VERTEX\n#define CURVE_VALUE_TEXTURE uVCurveValu
 
 var screenMeshVert = "precision highp float;attribute vec2 aPos;varying vec2 uv;void main(){gl_Position=vec4(aPos,0.,1.0);uv=(aPos+vec2(1.0))/2.;}";
 
-var colorGradingFrag = "precision highp float;\n#define HALF_MAX 60000.0\n#define ACEScc_MIDGRAY 0.4135884\nvarying vec2 uv;uniform sampler2D _GaussianTex;uniform sampler2D _SceneTex;uniform float _BloomIntensity;uniform float _Brightness;uniform float _Saturation;uniform float _Contrast;uniform bool _UseBloom;uniform bool _UseToneMapping;uniform vec3 _VignetteColor;uniform vec2 _VignetteCenter;uniform float _VignetteIntensity;uniform float _VignetteSmoothness;uniform float _VignetteRoundness;mat3 LinearToACES=mat3(0.59719,0.07600,0.02840,0.35458,0.90834,0.13383,0.04823,0.01566,0.83777);mat3 ACESToLinear=mat3(1.60475,-0.10208,-0.00327,-0.53108,1.10813,-0.07276,-0.07367,-0.00605,1.07602);float log10(float x){return log(x)/log(10.0);}vec3 log10(vec3 v){return vec3(log10(v.x),log10(v.y),log10(v.z));}vec3 LinearToLogC(vec3 x){return 0.244161*log10(5.555556*x+0.047996)+0.386036;}vec3 LogCToLinear(vec3 x){return(pow(vec3(10.0),(x-0.386036)/0.244161)-0.047996)/5.555556;}vec3 rrt_and_odt_fit(vec3 col){vec3 a=col*(col+0.0245786)-0.000090537;vec3 b=col*(0.983729*col+0.4329510)+0.238081;return a/b;}vec3 ACESToneMapping(vec3 col){vec3 aces=LinearToACES*col;aces=rrt_and_odt_fit(aces);col=ACESToLinear*aces;return col;}vec3 LinearToSrgb(vec3 c){return mix(1.055*pow(c,vec3(1./2.4))-0.055,12.92*c,step(c,vec3(0.0031308)));}vec3 GammaCorrection(vec3 c){return pow(c,vec3(1.0/2.2));}vec3 ApplyVignette(vec3 inputColor,vec2 uv,vec2 center,float intensity,float roundness,float smoothness,vec3 color){vec2 dist=abs(uv-center)*intensity;dist.x*=roundness;float vfactor=pow(clamp((1.0-dot(dist,dist)),0.0,1.0),smoothness);return inputColor*mix(color,vec3(1.0),vfactor);}void main(){vec4 hdrColor=texture2D(_SceneTex,uv);hdrColor*=hdrColor.a;hdrColor.rgb=pow(hdrColor.rgb,vec3(2.2));vec3 finalColor=hdrColor.rgb;if(_UseBloom){vec4 bloomColor=texture2D(_GaussianTex,uv);bloomColor.rgb*=_BloomIntensity;finalColor+=bloomColor.rgb;}if(_VignetteIntensity>0.0){finalColor=ApplyVignette(finalColor,uv,_VignetteCenter,_VignetteIntensity,_VignetteRoundness,_VignetteSmoothness,_VignetteColor);}finalColor=finalColor*_Brightness;vec3 colorLog=LinearToLogC(finalColor);colorLog=(colorLog-ACEScc_MIDGRAY)*_Contrast+ACEScc_MIDGRAY;finalColor=LogCToLinear(colorLog);finalColor=max(finalColor,0.0);float luminance=0.2125*finalColor.r+0.7154*finalColor.g+0.0721*finalColor.b;vec3 luminanceColor=vec3(luminance,luminance,luminance);finalColor=(finalColor-luminanceColor)*_Saturation+luminanceColor;finalColor=max(finalColor,0.0);if(_UseToneMapping){finalColor=max(vec3(0.0),ACESToneMapping(finalColor));}gl_FragColor=vec4(clamp(GammaCorrection(finalColor),0.0,1.0),1.0);}";
+var colorGradingFrag = "precision highp float;\n#define HALF_MAX 60000.0\n#define ACEScc_MIDGRAY 0.4135884\nvarying vec2 uv;uniform sampler2D _GaussianTex;uniform sampler2D _SceneTex;uniform float _BloomIntensity;uniform float _Brightness;uniform float _Saturation;uniform float _Contrast;uniform bool _UseBloom;uniform bool _UseToneMapping;uniform vec3 _VignetteColor;uniform vec2 _VignetteCenter;uniform float _VignetteIntensity;uniform float _VignetteSmoothness;uniform float _VignetteRoundness;mat3 LinearToACES=mat3(0.59719,0.07600,0.02840,0.35458,0.90834,0.13383,0.04823,0.01566,0.83777);mat3 ACESToLinear=mat3(1.60475,-0.10208,-0.00327,-0.53108,1.10813,-0.07276,-0.07367,-0.00605,1.07602);float log10(float x){return log(x)/log(10.0);}vec3 log10(vec3 v){return vec3(log10(v.x),log10(v.y),log10(v.z));}vec3 LinearToLogC(vec3 x){return 0.244161*log10(5.555556*x+0.047996)+0.386036;}vec3 LogCToLinear(vec3 x){return(pow(vec3(10.0),(x-0.386036)/0.244161)-0.047996)/5.555556;}vec3 rrt_and_odt_fit(vec3 col){vec3 a=col*(col+0.0245786)-0.000090537;vec3 b=col*(0.983729*col+0.4329510)+0.238081;return a/b;}vec3 ACESToneMapping(vec3 col){vec3 aces=LinearToACES*col;aces=rrt_and_odt_fit(aces);col=ACESToLinear*aces;return col;}vec3 LinearToSrgb(vec3 c){return mix(1.055*pow(c,vec3(1./2.4))-0.055,12.92*c,step(c,vec3(0.0031308)));}vec3 GammaCorrection(vec3 c){return pow(c,vec3(1.0/2.2));}vec3 ApplyVignette(vec3 inputColor,vec2 uv,vec2 center,float intensity,float roundness,float smoothness,vec3 color){vec2 dist=abs(uv-center)*intensity;dist.x*=roundness;float vfactor=pow(clamp((1.0-dot(dist,dist)),0.0,1.0),smoothness);return inputColor*mix(color,vec3(1.0),vfactor);}void main(){vec4 hdrColor=texture2D(_SceneTex,uv);hdrColor.rgb=pow(hdrColor.rgb,vec3(2.2));vec3 finalColor=hdrColor.rgb;if(_UseBloom){vec4 bloomColor=texture2D(_GaussianTex,uv);bloomColor.rgb*=_BloomIntensity;finalColor+=bloomColor.rgb;}if(_VignetteIntensity>0.0){finalColor=ApplyVignette(finalColor,uv,_VignetteCenter,_VignetteIntensity,_VignetteRoundness,_VignetteSmoothness,_VignetteColor);}finalColor=finalColor*_Brightness;vec3 colorLog=LinearToLogC(finalColor);colorLog=(colorLog-ACEScc_MIDGRAY)*_Contrast+ACEScc_MIDGRAY;finalColor=LogCToLinear(colorLog);finalColor=max(finalColor,0.0);float luminance=0.2125*finalColor.r+0.7154*finalColor.g+0.0721*finalColor.b;vec3 luminanceColor=vec3(luminance,luminance,luminance);finalColor=(finalColor-luminanceColor)*_Saturation+luminanceColor;finalColor=max(finalColor,0.0);if(_UseToneMapping){finalColor=max(vec3(0.0),ACESToneMapping(finalColor));}float alpha=min(hdrColor.a,1.0);gl_FragColor=vec4(clamp(GammaCorrection(finalColor),0.0,1.0),alpha);}";
 
 var gaussianDown_frag = "precision highp float;varying vec2 uv;uniform sampler2D _MainTex;uniform vec2 _TextureSize;float GaussWeight2D(float x,float y,float sigma){float PI=3.14159265358;float E=2.71828182846;float sigma_2=pow(sigma,2.0);float a=-(x*x+y*y)/(2.0*sigma_2);return pow(E,a)/(2.0*PI*sigma_2);}vec3 GaussNxN(sampler2D tex,vec2 uv,vec2 stride,float sigma){vec3 color=vec3(0.,0.,0.);const int r=5/2;float weight=0.0;for(int i=-r;i<=r;i++){for(int j=-r;j<=r;j++){float w=GaussWeight2D(float(i),float(j),sigma);vec2 coord=uv+vec2(i,j)*stride;color+=texture2D(tex,coord).rgb*w;weight+=w;}}color/=weight;return color;}void main(){vec4 mainColor=texture2D(_MainTex,uv);vec3 color=mainColor.rgb;color=GaussNxN(_MainTex,uv,1.0/_TextureSize,1.0);gl_FragColor=vec4(color,1.0);}";
 
@@ -18074,10 +18078,10 @@ var ParticleMesh = /*#__PURE__*/ function() {
     };
     _proto.onUpdate = function onUpdate(dt) {
         var aPosArray = this.geometry.getAttributeData("aPos"); // vector3
-        var particleCount = Math.ceil(aPosArray.length / 12);
-        this.applyTranslation(particleCount, dt);
-        this.applyRotation(particleCount, dt);
-        this.applyLinearMove(particleCount, dt);
+        var vertexCount = Math.ceil(aPosArray.length / 12);
+        this.applyTranslation(vertexCount, dt);
+        this.applyRotation(vertexCount, dt);
+        this.applyLinearMove(vertexCount, dt);
     };
     _proto.minusTime = function minusTime(time) {
         var aOffset = this.geometry.getAttributeData("aOffset");
@@ -18111,7 +18115,9 @@ var ParticleMesh = /*#__PURE__*/ function() {
                 aPos: new Float32Array(48),
                 aRot: new Float32Array(32),
                 aOffset: new Float32Array(16),
-                aTranslation: new Float32Array(12)
+                aTranslation: new Float32Array(12),
+                aLinearMove: new Float32Array(12),
+                aRotation0: new Float32Array(36)
             };
             var useSprite = this.useSprite;
             if (useSprite) {
@@ -18220,13 +18226,13 @@ var ParticleMesh = /*#__PURE__*/ function() {
             geometry.setDrawCount(this.particleCount * 6);
         }
     };
-    _proto.applyTranslation = function applyTranslation(particleCount, deltaTime) {
+    _proto.applyTranslation = function applyTranslation(vertexCount, deltaTime) {
         var localTime = this.time;
         var aTranslationArray = this.geometry.getAttributeData("aTranslation");
         var aVelArray = this.geometry.getAttributeData("aVel"); // vector3
         var aOffsetArray = this.geometry.getAttributeData("aOffset");
-        if (aTranslationArray.length < particleCount * 3) {
-            aTranslationArray = this.expandArray(aTranslationArray, particleCount * 3);
+        if (aTranslationArray.length < vertexCount * 3) {
+            aTranslationArray = this.expandArray(aTranslationArray, vertexCount * 3);
         }
         // const velocity = this.cachedVelocity;
         var velocityX = 0;
@@ -18234,7 +18240,7 @@ var ParticleMesh = /*#__PURE__*/ function() {
         var velocityZ = 0;
         var uAcceleration = this.mesh.material.getVector4("uAcceleration");
         var uGravityModifierValue = this.mesh.material.getVector4("uGravityModifierValue");
-        for(var i = 0; i < particleCount; i++){
+        for(var i = 0; i < vertexCount; i += 4){
             var velOffset = i * 12 + 3;
             velocityX = aVelArray[velOffset];
             velocityY = aVelArray[velOffset + 1];
@@ -18266,24 +18272,36 @@ var ParticleMesh = /*#__PURE__*/ function() {
             var aTranslationOffset = i * 3;
             if (aOffsetArray[i * 4 + 2] < localTime) {
                 // const translation = velocity.multiply(deltaTime / 1000);
-                aTranslationArray[aTranslationOffset] += velocityX * (deltaTime / 1000);
-                aTranslationArray[aTranslationOffset + 1] += velocityY * (deltaTime / 1000);
-                aTranslationArray[aTranslationOffset + 2] += velocityZ * (deltaTime / 1000);
+                var aTranslationX = velocityX * (deltaTime / 1000);
+                var aTranslationY = velocityY * (deltaTime / 1000);
+                var aTranslationZ = velocityZ * (deltaTime / 1000);
+                aTranslationArray[aTranslationOffset] += aTranslationX;
+                aTranslationArray[aTranslationOffset + 1] += aTranslationY;
+                aTranslationArray[aTranslationOffset + 2] += aTranslationZ;
+                aTranslationArray[aTranslationOffset + 3] += aTranslationX;
+                aTranslationArray[aTranslationOffset + 4] += aTranslationY;
+                aTranslationArray[aTranslationOffset + 5] += aTranslationZ;
+                aTranslationArray[aTranslationOffset + 6] += aTranslationX;
+                aTranslationArray[aTranslationOffset + 7] += aTranslationY;
+                aTranslationArray[aTranslationOffset + 8] += aTranslationZ;
+                aTranslationArray[aTranslationOffset + 9] += aTranslationX;
+                aTranslationArray[aTranslationOffset + 10] += aTranslationY;
+                aTranslationArray[aTranslationOffset + 11] += aTranslationZ;
             }
         }
         this.geometry.setAttributeData("aTranslation", aTranslationArray);
     };
-    _proto.applyRotation = function applyRotation(particleCount, deltaTime) {
+    _proto.applyRotation = function applyRotation(vertexCount, deltaTime) {
         var aRotationArray = this.geometry.getAttributeData("aRotation0");
         var aOffsetArray = this.geometry.getAttributeData("aOffset");
         var aRotArray = this.geometry.getAttributeData("aRot"); // vector3
         var aSeedArray = this.geometry.getAttributeData("aSeed"); // float
         var localTime = this.time;
         var aRotationMatrix = this.cachedRotationMatrix;
-        if (aRotationArray.length < particleCount * 9) {
-            aRotationArray = this.expandArray(aRotationArray, particleCount * 9);
+        if (aRotationArray.length < vertexCount * 9) {
+            aRotationArray = this.expandArray(aRotationArray, vertexCount * 9);
         }
-        for(var i = 0; i < particleCount; i++){
+        for(var i = 0; i < vertexCount; i += 4){
             var time = localTime - aOffsetArray[i * 4 + 2];
             var duration = aOffsetArray[i * 4 + 3];
             var life = clamp$1(time / duration, 0.0, 1.0);
@@ -18361,20 +18379,25 @@ var ParticleMesh = /*#__PURE__*/ function() {
             var aRotationOffset = i * 9;
             var matrixArray = aRotationMatrix.elements;
             aRotationArray.set(matrixArray, aRotationOffset);
+            if (i + 4 <= vertexCount) {
+                aRotationArray.set(matrixArray, aRotationOffset + 9);
+                aRotationArray.set(matrixArray, aRotationOffset + 18);
+                aRotationArray.set(matrixArray, aRotationOffset + 27);
+            }
         }
         this.geometry.setAttributeData("aRotation0", aRotationArray);
     };
-    _proto.applyLinearMove = function applyLinearMove(particleCount, deltaTime) {
+    _proto.applyLinearMove = function applyLinearMove(vertexCount, deltaTime) {
         var aLinearMoveArray = this.geometry.getAttributeData("aLinearMove");
         var aOffsetArray = this.geometry.getAttributeData("aOffset");
         var aSeedArray = this.geometry.getAttributeData("aSeed"); // float
         var localTime = this.time;
-        if (aLinearMoveArray.length < particleCount * 3) {
-            aLinearMoveArray = this.expandArray(aLinearMoveArray, particleCount * 3);
+        if (aLinearMoveArray.length < vertexCount * 3) {
+            aLinearMoveArray = this.expandArray(aLinearMoveArray, vertexCount * 3);
         }
         var linearMove = this.cachedLinearMove;
         if (this.linearVelOverLifetime && this.linearVelOverLifetime.enabled) {
-            for(var i = 0; i < particleCount; i++){
+            for(var i = 0; i < vertexCount; i += 4){
                 var time = localTime - aOffsetArray[i * 4 + 2];
                 var duration = aOffsetArray[i * 4 + 3];
                 // const life = math.clamp(time / duration, 0.0, 1.0);
@@ -18431,6 +18454,15 @@ var ParticleMesh = /*#__PURE__*/ function() {
                 aLinearMoveArray[aLinearMoveOffset] = linearMove.x;
                 aLinearMoveArray[aLinearMoveOffset + 1] = linearMove.y;
                 aLinearMoveArray[aLinearMoveOffset + 2] = linearMove.z;
+                aLinearMoveArray[aLinearMoveOffset + 3] = linearMove.x;
+                aLinearMoveArray[aLinearMoveOffset + 4] = linearMove.y;
+                aLinearMoveArray[aLinearMoveOffset + 5] = linearMove.z;
+                aLinearMoveArray[aLinearMoveOffset + 6] = linearMove.x;
+                aLinearMoveArray[aLinearMoveOffset + 7] = linearMove.y;
+                aLinearMoveArray[aLinearMoveOffset + 8] = linearMove.z;
+                aLinearMoveArray[aLinearMoveOffset + 9] = linearMove.x;
+                aLinearMoveArray[aLinearMoveOffset + 10] = linearMove.y;
+                aLinearMoveArray[aLinearMoveOffset + 11] = linearMove.z;
             }
         }
         this.geometry.setAttributeData("aLinearMove", aLinearMoveArray);
@@ -21183,6 +21215,7 @@ exports.VFXItem = /*#__PURE__*/ function(EffectsObject) {
             var component = _step.value;
             if (component.enabled && !component.isStartCalled) {
                 component.onStart();
+                component.isStartCalled = true;
             }
         }
         for(var _iterator1 = _create_for_of_iterator_helper_loose(this.components), _step1; !(_step1 = _iterator1()).done;){
@@ -25406,7 +25439,6 @@ var LateUpdateTickData = /*#__PURE__*/ function(TickData) {
         }));
         _this.url = scene.url;
         _this.assigned = true;
-        _this.globalTime = 0;
         _this.interactive = true;
         _this.handleItemMessage = handleItemMessage;
         _this.createRenderFrame();
@@ -25569,7 +25601,6 @@ var LateUpdateTickData = /*#__PURE__*/ function(TickData) {
    * 重置状态函数
    */ _proto.reset = function reset() {
         this.rendererOptions = null;
-        this.globalTime = 0;
         this.rootItem.ended = false;
         this.pluginSystem.resetComposition(this, this.renderFrame);
     };
@@ -25607,9 +25638,8 @@ var LateUpdateTickData = /*#__PURE__*/ function(TickData) {
         if (!this.assigned || this.paused) {
             return;
         }
-        var time = this.getUpdateTime(deltaTime * this.speed);
-        this.globalTime += time;
-        this.updateRootComposition();
+        var dt = this.getUpdateTime(deltaTime * this.speed);
+        this.updateRootComposition(dt / 1000);
         this.updateVideo();
         // 更新 model-tree-plugin
         this.updatePluginLoaders(deltaTime);
@@ -25618,8 +25648,8 @@ var LateUpdateTickData = /*#__PURE__*/ function(TickData) {
             this.callAwake(this.rootItem);
             this.rootItem.beginPlay();
         }
-        this.sceneTicking.update.tick(time);
-        this.sceneTicking.lateUpdate.tick(time);
+        this.sceneTicking.update.tick(dt);
+        this.sceneTicking.lateUpdate.tick(dt);
         this.updateCamera();
         this.prepareRender();
         if (this.shouldDispose()) {
@@ -25760,9 +25790,9 @@ var LateUpdateTickData = /*#__PURE__*/ function(TickData) {
     };
     /**
    * 更新主合成组件
-   */ _proto.updateRootComposition = function updateRootComposition() {
+   */ _proto.updateRootComposition = function updateRootComposition(deltaTime) {
         if (this.rootComposition.isActiveAndEnabled) {
-            var localTime = this.toLocalTime(this.globalTime / 1000);
+            var localTime = this.toLocalTime(this.time + deltaTime);
             this.rootComposition.time = localTime;
         }
     };
@@ -28105,7 +28135,7 @@ registerPlugin("sprite", SpriteLoader, exports.VFXItem, true);
 registerPlugin("particle", ParticleLoader, exports.VFXItem, true);
 registerPlugin("cal", CalculateLoader, exports.VFXItem, true);
 registerPlugin("interact", InteractLoader, exports.VFXItem, true);
-var version = "2.1.0-alpha.3";
+var version = "2.1.0-alpha.5";
 logger.info("Core version: " + version + ".");
 
 exports.AbstractPlugin = AbstractPlugin;