@galacean/engine-core 1.3.14 → 1.3.16

package/dist/main.js

@@ -2252,7 +2252,7 @@ var size_over_lifetime_module = "#define GLSLIFY 1\n#ifdef RENDERER_SOL_CURVE_MO
 
 var color_over_lifetime_module = "#define GLSLIFY 1\n#if defined(RENDERER_COL_GRADIENT) || defined(RENDERER_COL_RANDOM_GRADIENTS)\nuniform vec4 renderer_COLMaxGradientColor[4];uniform vec2 renderer_COLMaxGradientAlpha[4];\n#ifdef RENDERER_COL_RANDOM_GRADIENTS\nuniform vec4 renderer_COLMinGradientColor[4];uniform vec2 renderer_COLMinGradientAlpha[4];\n#endif\nuniform vec4 renderer_COLGradientKeysMaxTime;\n#endif\n#if defined(RENDERER_COL_GRADIENT) || defined(RENDERER_COL_RANDOM_GRADIENTS)\nvec4 evaluateParticleGradient(in vec4 colorKeys[4],in float colorKeysMaxTime,in vec2 alphaKeys[4],in float alphaKeysMaxTime,in float normalizedAge){vec4 value;float alphaAge=min(normalizedAge,alphaKeysMaxTime);for(int i=0;i<4;i++){vec2 key=alphaKeys[i];float time=key.x;if(alphaAge<=time){if(i==0){value.a=alphaKeys[0].y;}else{vec2 lastKey=alphaKeys[i-1];float lastTime=lastKey.x;float age=(alphaAge-lastTime)/(time-lastTime);value.a=mix(lastKey.y,key.y,age);}break;}}float colorAge=min(normalizedAge,colorKeysMaxTime);for(int i=0;i<4;i++){vec4 key=colorKeys[i];float time=key.x;if(colorAge<=time){if(i==0){value.rgb=colorKeys[0].yzw;}else{vec4 lastKey=colorKeys[i-1];float lastTime=lastKey.x;float age=(colorAge-lastTime)/(time-lastTime);value.rgb=mix(lastKey.yzw,key.yzw,age);}break;}}return value;}\n#endif\nvec4 computeParticleColor(in vec4 color,in float normalizedAge){\n#if defined(RENDERER_COL_GRADIENT) || defined(RENDERER_COL_RANDOM_GRADIENTS)\nvec4 gradientColor=evaluateParticleGradient(renderer_COLMaxGradientColor,renderer_COLGradientKeysMaxTime.z,renderer_COLMaxGradientAlpha,renderer_COLGradientKeysMaxTime.w,normalizedAge);\n#endif\n#ifdef RENDERER_COL_RANDOM_GRADIENTS\ngradientColor=mix(evaluateParticleGradient(renderer_COLMinGradientColor,renderer_COLGradientKeysMaxTime.x,renderer_COLMinGradientAlpha,renderer_COLGradientKeysMaxTime.y,normalizedAge),gradientColor,a_Random0.y);\n#endif\n#if defined(RENDERER_COL_GRADIENT) || defined(RENDERER_COL_RANDOM_GRADIENTS)\ncolor*=gradientColor;\n#endif\nreturn color;}"; // eslint-disable-line
 
-var texture_sheet_animation_module = "#define GLSLIFY 1\n#if defined(RENDERER_TSA_FRAME_CURVE) || defined(RENDERER_TSA_FRAME_RANDOM_CURVES)\nuniform float renderer_TSACycles;uniform vec3 renderer_TSATillingParams;uniform vec2 renderer_TSAFrameMaxCurve[4];\n#ifdef RENDERER_TSA_FRAME_RANDOM_CURVES\nuniform vec2 renderer_TSAFrameMinCurve[4];\n#endif\n#endif\nvec2 computeParticleUV(in vec2 uv,in float normalizedAge){\n#if defined(RENDERER_TSA_FRAME_CURVE) || defined(RENDERER_TSA_FRAME_RANDOM_CURVES)\nfloat scaledNormalizedAge=normalizedAge*renderer_TSACycles;float cycleNormalizedAge=scaledNormalizedAge-floor(scaledNormalizedAge);float normalizedFrame=evaluateParticleCurve(renderer_TSAFrameMaxCurve,cycleNormalizedAge);\n#ifdef RENDERER_TSA_FRAME_RANDOM_CURVES\nnormalizedFrame=mix(evaluateParticleCurve(renderer_TSAFrameMinCurve,cycleNormalizedAge),normalizedFrame,a_Random1.x);\n#endif\nfloat frame=floor(normalizedFrame*renderer_TSATillingParams.z);float tileRow=frame*renderer_TSATillingParams.x;float floorTotalULength=floor(tileRow);uv.x+=tileRow-tileRowIndex;uv.y+=tileRowIndex*renderer_TSATillingParams.y;\n#endif\nreturn uv;}"; // eslint-disable-line
+var texture_sheet_animation_module = "#define GLSLIFY 1\n#if defined(RENDERER_TSA_FRAME_CURVE) || defined(RENDERER_TSA_FRAME_RANDOM_CURVES)\nuniform float renderer_TSACycles;uniform vec3 renderer_TSATillingParams;uniform vec2 renderer_TSAFrameMaxCurve[4];\n#ifdef RENDERER_TSA_FRAME_RANDOM_CURVES\nuniform vec2 renderer_TSAFrameMinCurve[4];\n#endif\n#endif\nvec2 computeParticleUV(in vec2 uv,in float normalizedAge){\n#if defined(RENDERER_TSA_FRAME_CURVE) || defined(RENDERER_TSA_FRAME_RANDOM_CURVES)\nfloat scaledNormalizedAge=normalizedAge*renderer_TSACycles;float cycleNormalizedAge=scaledNormalizedAge-floor(scaledNormalizedAge);float normalizedFrame=evaluateParticleCurve(renderer_TSAFrameMaxCurve,cycleNormalizedAge);\n#ifdef RENDERER_TSA_FRAME_RANDOM_CURVES\nnormalizedFrame=mix(evaluateParticleCurve(renderer_TSAFrameMinCurve,cycleNormalizedAge),normalizedFrame,a_Random1.x);\n#endif\nfloat frame=floor(normalizedFrame*renderer_TSATillingParams.z);float tileRow=frame*renderer_TSATillingParams.x;float tileRowIndex=floor(tileRow);uv.x+=tileRow-tileRowIndex;uv.y+=tileRowIndex*renderer_TSATillingParams.y;\n#endif\nreturn uv;}"; // eslint-disable-line
 
 var sphere_billboard = "#define GLSLIFY 1\n#ifdef RENDERER_MODE_SPHERE_BILLBOARD\nvec2 corner=a_CornerTextureCoordinate.xy+renderer_PivotOffset.xy;vec3 sideVector=normalize(cross(camera_Forward,camera_Up));vec3 upVector=normalize(cross(sideVector,camera_Forward));corner*=computeParticleSizeBillboard(a_StartSize.xy,normalizedAge);\n#if defined(RENDERER_ROL_CONSTANT_MODE) || defined(RENDERER_ROL_CURVE_MODE)\nif(renderer_ThreeDStartRotation){vec3 rotation=vec3(a_StartRotation0.xy,computeParticleRotationFloat(a_StartRotation0.z,age,normalizedAge));center+=renderer_SizeScale.xzy*rotationByEuler(corner.x*sideVector+corner.y*upVector,rotation);}else{float rot=computeParticleRotationFloat(a_StartRotation0.x,age,normalizedAge);float c=cos(rot);float s=sin(rot);mat2 rotation=mat2(c,-s,s,c);corner=rotation*corner;center+=renderer_SizeScale.xzy*(corner.x*sideVector+corner.y*upVector);}\n#else\nif(renderer_ThreeDStartRotation){center+=renderer_SizeScale.xzy*rotationByEuler(corner.x*sideVector+corner.y*upVector,a_StartRotation0);}else{float c=cos(a_StartRotation0.x);float s=sin(a_StartRotation0.x);mat2 rotation=mat2(c,-s,s,c);corner=rotation*corner;center+=renderer_SizeScale.xzy*(corner.x*sideVector+corner.y*upVector);}\n#endif\n#endif\n"; // eslint-disable-line
 
@@ -10332,7 +10332,7 @@ var /**
             if (background.mode === exports.BackgroundMode.Sky) {
                 background.sky._render(context);
             } else if (background.mode === exports.BackgroundMode.Texture && background.texture) {
-                this._drawBackgroundTexture(engine, background);
+                this._drawBackgroundTexture(camera, background);
             }
         }
         // Copy opaque texture
@@ -10428,7 +10428,8 @@ var /**
             renderElement.renderQueueFlags |= flag;
         }
     };
-    _proto._drawBackgroundTexture = function _drawBackgroundTexture(engine, background) {
+    _proto._drawBackgroundTexture = function _drawBackgroundTexture(camera, background) {
+        var engine = camera.engine;
         var rhi = engine._hardwareRenderer;
         var canvas = engine.canvas;
         var material = background._material, mesh = background._mesh;
@@ -10440,6 +10441,7 @@ var /**
         var program = pass._getShaderProgram(engine, Shader._compileMacros);
         program.bind();
         program.uploadAll(program.materialUniformBlock, material.shaderData);
+        program.uploadAll(program.cameraUniformBlock, camera.shaderData);
         program.uploadUnGroupTextures();
         (pass._renderState || material.renderState)._applyStates(engine, false, pass._renderStateDataMap, material.shaderData);
         rhi.drawPrimitive(mesh._primitive, mesh.subMesh, program);
@@ -23078,7 +23080,7 @@ var skyProceduralVs = "#define GLSLIFY 1\n#define OUTER_RADIUS 1.025\n#define RA
 
 var backgroundTextureFs = "#define GLSLIFY 1\nuniform sampler2D material_BaseTexture;varying vec2 v_uv;void main(){gl_FragColor=texture2D(material_BaseTexture,v_uv);}"; // eslint-disable-line
 
-var backgroundTextureVs = "#define GLSLIFY 1\nattribute vec3 POSITION;attribute vec2 TEXCOORD_0;varying vec2 v_uv;void main(){gl_Position=vec4(POSITION,1.0);v_uv=TEXCOORD_0;}"; // eslint-disable-line
+var backgroundTextureVs = "#define GLSLIFY 1\nattribute vec3 POSITION;attribute vec2 TEXCOORD_0;varying vec2 v_uv;uniform vec4 camera_ProjectionParams;void main(){gl_Position=vec4(POSITION,1.0);gl_Position.y*=camera_ProjectionParams.x;v_uv=TEXCOORD_0;}"; // eslint-disable-line
 
 var blinnPhongFs = "#define GLSLIFY 1\n#include <common>\n#include <camera_declare>\n#include <uv_share>\n#include <normal_share>\n#include <color_share>\n#include <worldpos_share>\n#include <light_frag_define>\n#include <ShadowFragmentDeclaration>\n#include <mobile_material_frag>\n#include <FogFragmentDeclaration>\n#include <normal_get>\nvoid main(){\n#include <begin_mobile_frag>\n#include <begin_viewdir_frag>\n#include <mobile_blinnphong_frag>\ngl_FragColor=emission+ambient+diffuse+specular;\n#ifdef MATERIAL_IS_TRANSPARENT\ngl_FragColor.a=diffuse.a;\n#else\ngl_FragColor.a=1.0;\n#endif\n#include <FogFragment>\n#ifndef ENGINE_IS_COLORSPACE_GAMMA\ngl_FragColor=linearToGamma(gl_FragColor);\n#endif\n}"; // eslint-disable-line
 
@@ -23090,7 +23092,7 @@ var depthOnlyVs = "#define GLSLIFY 1\n#include <common>\n#include <common_vert>\
 
 var particleFs = "#define GLSLIFY 1\n#include <common>\nvarying vec4 v_Color;varying vec2 v_TextureCoordinate;uniform sampler2D material_BaseTexture;uniform vec4 material_BaseColor;\n#ifdef RENDERER_MODE_MESH\nvarying vec4 v_MeshColor;\n#endif\nvoid main(){vec4 color=material_BaseColor*v_Color;\n#ifdef RENDERER_MODE_MESH\ncolor*=v_MeshColor;\n#endif\n#ifdef MATERIAL_HAS_BASETEXTURE\nvec4 textureColor=texture2D(material_BaseTexture,v_TextureCoordinate);\n#ifndef ENGINE_IS_COLORSPACE_GAMMA\ntextureColor=gammaToLinear(textureColor);\n#endif\ncolor*=textureColor;\n#endif\ngl_FragColor=color;\n#ifndef ENGINE_IS_COLORSPACE_GAMMA\ngl_FragColor=linearToGamma(gl_FragColor);\n#endif\n}"; // eslint-disable-line
 
-var particleVs = "#define GLSLIFY 1\n#if defined(RENDERER_MODE_SPHERE_BILLBOARD) || defined(RENDERER_MODE_STRETCHED_BILLBOARD) || defined(RENDERER_MODE_HORIZONTAL_BILLBOARD) || defined(RENDERER_MODE_VERTICAL_BILLBOARD)\nattribute vec4 a_CornerTextureCoordinate;\n#endif\n#ifdef RENDERER_MODE_MESH\nattribute vec3 a_MeshPosition;attribute vec4 a_MeshColor;attribute vec2 a_MeshTextureCoordinate;varying vec4 v_MeshColor;\n#endif\nattribute vec4 a_ShapePositionStartLifeTime;attribute vec4 a_DirectionTime;attribute vec4 a_StartColor;attribute vec3 a_StartSize;attribute vec3 a_StartRotation0;attribute float a_StartSpeed;attribute vec4 a_Random0;\n#if defined(RENDERER_TSA_FRAME_RANDOM_CURVES) || defined(RENDERER_VOL_RANDOM_CONSTANT) || defined(RENDERER_VOL_RANDOM_CURVE)\nattribute vec4 a_Random1;\n#endif\nattribute vec3 a_SimulationWorldPosition;attribute vec4 a_SimulationWorldRotation;varying vec4 v_Color;\n#ifdef MATERIAL_HAS_BASETEXTURE\nattribute vec4 a_SimulationUV;varying vec2 v_TextureCoordinate;\n#endif\nuniform float renderer_CurrentTime;uniform vec3 renderer_Gravity;uniform vec2 u_DragConstant;uniform vec3 renderer_WorldPosition;uniform vec4 renderer_WorldRotation;uniform bool renderer_ThreeDStartRotation;uniform int renderer_ScalingMode;uniform vec3 renderer_PositionScale;uniform vec3 renderer_SizeScale;uniform vec3 renderer_PivotOffset;uniform mat4 camera_ViewMat;uniform mat4 camera_ProjMat;\n#ifdef RENDERER_MODE_STRETCHED_BILLBOARD\nuniform vec3 camera_Position;\n#endif\nuniform vec3 camera_Forward;uniform vec3 camera_Up;uniform float renderer_StretchedBillboardLengthScale;uniform float renderer_StretchedBillboardSpeedScale;uniform int renderer_SimulationSpace;\n#include <particle_common>\n#include <velocity_over_lifetime_module>\n#include <color_over_lifetime_module>\n#include <size_over_lifetime_module>\n#include <rotation_over_lifetime_module>\n#include <texture_sheet_animation_module>\nvoid main(){float age=renderer_CurrentTime-a_DirectionTime.w;float normalizedAge=age/a_ShapePositionStartLifeTime.w;vec3 lifeVelocity;if(normalizedAge<1.0){vec3 startVelocity=a_DirectionTime.xyz*a_StartSpeed;\n#if defined(RENDERER_VOL_CONSTANT) || defined(RENDERER_VOL_CURVE) || defined(RENDERER_VOL_RANDOM_CONSTANT) || defined(RENDERER_VOL_RANDOM_CURVE)\nlifeVelocity=computeParticleLifeVelocity(normalizedAge);\n#endif\nvec3 gravityVelocity=renderer_Gravity*age;vec4 worldRotation;if(renderer_SimulationSpace==0){worldRotation=renderer_WorldRotation;}else{worldRotation=a_SimulationWorldRotation;}vec3 dragData=a_DirectionTime.xyz*mix(u_DragConstant.x,u_DragConstant.y,a_Random0.x);vec3 center=computeParticlePosition(startVelocity,lifeVelocity,age,normalizedAge,gravityVelocity,worldRotation,dragData);\n#include <sphere_billboard>\n#include <stretched_billboard>\n#include <horizontal_billboard>\n#include <vertical_billboard>\n#include <particle_mesh>\ngl_Position=camera_ProjMat*camera_ViewMat*vec4(center,1.0);v_Color=computeParticleColor(a_StartColor,normalizedAge);\n#ifdef MATERIAL_HAS_BASETEXTURE\nvec2 simulateUV;\n#if defined(RENDERER_MODE_SPHERE_BILLBOARD) || defined(RENDERER_MODE_STRETCHED_BILLBOARD) || defined(RENDERER_MODE_HORIZONTAL_BILLBOARD) || defined(RENDERER_MODE_VERTICAL_BILLBOARD)\nsimulateUV=a_CornerTextureCoordinate.zw*a_SimulationUV.xy+a_SimulationUV.zw;v_TextureCoordinate=computeParticleUV(simulateUV,normalizedAge);\n#endif\n#ifdef RENDERER_MODE_MESH\nsimulateUV=a_SimulationUV.xy+a_MeshTextureCoordinate*a_SimulationUV.zw;v_TextureCoordinate=computeParticleUV(simulateUV,normalizedAge);\n#endif\n#endif\n}else{gl_Position=vec4(2.0,2.0,2.0,1.0);}}"; // eslint-disable-line
+var particleVs = "#define GLSLIFY 1\n#if defined(RENDERER_MODE_SPHERE_BILLBOARD) || defined(RENDERER_MODE_STRETCHED_BILLBOARD) || defined(RENDERER_MODE_HORIZONTAL_BILLBOARD) || defined(RENDERER_MODE_VERTICAL_BILLBOARD)\nattribute vec4 a_CornerTextureCoordinate;\n#endif\n#ifdef RENDERER_MODE_MESH\nattribute vec3 a_MeshPosition;attribute vec4 a_MeshColor;attribute vec2 a_MeshTextureCoordinate;varying vec4 v_MeshColor;\n#endif\nattribute vec4 a_ShapePositionStartLifeTime;attribute vec4 a_DirectionTime;attribute vec4 a_StartColor;attribute vec3 a_StartSize;attribute vec3 a_StartRotation0;attribute float a_StartSpeed;attribute vec4 a_Random0;\n#if defined(RENDERER_TSA_FRAME_RANDOM_CURVES) || defined(RENDERER_VOL_RANDOM_CONSTANT) || defined(RENDERER_VOL_RANDOM_CURVE)\nattribute vec4 a_Random1;\n#endif\nattribute vec3 a_SimulationWorldPosition;attribute vec4 a_SimulationWorldRotation;varying vec4 v_Color;\n#ifdef MATERIAL_HAS_BASETEXTURE\nattribute vec4 a_SimulationUV;varying vec2 v_TextureCoordinate;\n#endif\nuniform float renderer_CurrentTime;uniform vec3 renderer_Gravity;uniform vec2 u_DragConstant;uniform vec3 renderer_WorldPosition;uniform vec4 renderer_WorldRotation;uniform bool renderer_ThreeDStartRotation;uniform int renderer_ScalingMode;uniform vec3 renderer_PositionScale;uniform vec3 renderer_SizeScale;uniform vec3 renderer_PivotOffset;uniform mat4 camera_ViewMat;uniform mat4 camera_ProjMat;\n#ifdef RENDERER_MODE_STRETCHED_BILLBOARD\nuniform vec3 camera_Position;\n#endif\nuniform vec3 camera_Forward;uniform vec3 camera_Up;uniform float renderer_StretchedBillboardLengthScale;uniform float renderer_StretchedBillboardSpeedScale;uniform int renderer_SimulationSpace;\n#include <particle_common>\n#include <velocity_over_lifetime_module>\n#include <color_over_lifetime_module>\n#include <size_over_lifetime_module>\n#include <rotation_over_lifetime_module>\n#include <texture_sheet_animation_module>\nvoid main(){float age=renderer_CurrentTime-a_DirectionTime.w;float normalizedAge=age/a_ShapePositionStartLifeTime.w;vec3 lifeVelocity;if(normalizedAge<1.0){vec3 startVelocity=a_DirectionTime.xyz*a_StartSpeed;\n#if defined(RENDERER_VOL_CONSTANT) || defined(RENDERER_VOL_CURVE) || defined(RENDERER_VOL_RANDOM_CONSTANT) || defined(RENDERER_VOL_RANDOM_CURVE)\nlifeVelocity=computeParticleLifeVelocity(normalizedAge);\n#endif\nvec3 gravityVelocity=renderer_Gravity*a_Random0.x*age;vec4 worldRotation;if(renderer_SimulationSpace==0){worldRotation=renderer_WorldRotation;}else{worldRotation=a_SimulationWorldRotation;}vec3 dragData=a_DirectionTime.xyz*mix(u_DragConstant.x,u_DragConstant.y,a_Random0.x);vec3 center=computeParticlePosition(startVelocity,lifeVelocity,age,normalizedAge,gravityVelocity,worldRotation,dragData);\n#include <sphere_billboard>\n#include <stretched_billboard>\n#include <horizontal_billboard>\n#include <vertical_billboard>\n#include <particle_mesh>\ngl_Position=camera_ProjMat*camera_ViewMat*vec4(center,1.0);v_Color=computeParticleColor(a_StartColor,normalizedAge);\n#ifdef MATERIAL_HAS_BASETEXTURE\nvec2 simulateUV;\n#if defined(RENDERER_MODE_SPHERE_BILLBOARD) || defined(RENDERER_MODE_STRETCHED_BILLBOARD) || defined(RENDERER_MODE_HORIZONTAL_BILLBOARD) || defined(RENDERER_MODE_VERTICAL_BILLBOARD)\nsimulateUV=a_CornerTextureCoordinate.zw*a_SimulationUV.xy+a_SimulationUV.zw;v_TextureCoordinate=computeParticleUV(simulateUV,normalizedAge);\n#endif\n#ifdef RENDERER_MODE_MESH\nsimulateUV=a_SimulationUV.xy+a_MeshTextureCoordinate*a_SimulationUV.zw;v_TextureCoordinate=computeParticleUV(simulateUV,normalizedAge);\n#endif\n#endif\n}else{gl_Position=vec4(2.0,2.0,2.0,1.0);}}"; // eslint-disable-line
 
 var pbrSpecularFs = "#define GLSLIFY 1\n#include <common>\n#include <camera_declare>\n#include <FogFragmentDeclaration>\n#include <uv_share>\n#include <normal_share>\n#include <color_share>\n#include <worldpos_share>\n#include <light_frag_define>\n#include <pbr_frag_define>\n#include <pbr_helper>\nvoid main(){\n#include <pbr_frag>\n#include <FogFragment>\n#ifndef ENGINE_IS_COLORSPACE_GAMMA\ngl_FragColor=linearToGamma(gl_FragColor);\n#endif\n}"; // eslint-disable-line
 
@@ -26268,16 +26270,17 @@ Shader.create(_PostProcessManager.UBER_SHADER_NAME, blitVs, UberPost);
    * @internal
    */ _proto._onDisableInScene = function _onDisableInScene() {
         var componentsManager = this.scene._componentsManager;
+        var prototype = Script.prototype;
         if (!this._started) {
             componentsManager.removeOnStartScript(this);
         }
-        if (this._onUpdateIndex >= 0) {
+        if (this.onUpdate !== prototype.onUpdate) {
             componentsManager.removeOnUpdateScript(this);
         }
-        if (this._onLateUpdateIndex >= 0) {
+        if (this.onLateUpdate !== prototype.onLateUpdate) {
             componentsManager.removeOnLateUpdateScript(this);
         }
-        if (this._onPhysicsUpdateIndex >= 0) {
+        if (this.onPhysicsUpdate !== prototype.onPhysicsUpdate) {
             componentsManager.removeOnPhysicsUpdateScript(this);
         }
         this._entity._removeScript(this);
@@ -28285,7 +28288,8 @@ exports.AnimatorLayerBlendingMode = void 0;
     var _proto = AnimatorStatePlayData.prototype;
     _proto.reset = function reset(state, stateData, offsetFrameTime) {
         this.state = state;
-        this.frameTime = offsetFrameTime;
+        this.playedTime = 0;
+        this.offsetFrameTime = offsetFrameTime;
         this.stateData = stateData;
         this.playState = AnimatorStatePlayState.UnStarted;
         this.clipTime = state.clipStartTime * state.clip.length;
@@ -28304,9 +28308,9 @@ exports.AnimatorLayerBlendingMode = void 0;
         }
     };
     _proto.update = function update(deltaTime) {
-        this.frameTime += deltaTime;
+        this.playedTime += deltaTime;
         var state = this.state;
-        var time = this.frameTime;
+        var time = this.playedTime + this.offsetFrameTime;
         var duration = state._getDuration();
         this.playState = AnimatorStatePlayState.Playing;
         if (state.wrapMode === exports.WrapMode.Loop) {
@@ -28753,9 +28757,8 @@ exports.AnimatorLayerBlendingMode = void 0;
         var transition = anyStateTransitions.length && this._applyTransitionsByCondition(layerIndex, layerData, layer, state, anyStateTransitions, aniUpdate) || transitions.length && this._applyStateTransitions(layerIndex, layerData, layer, isForwards, srcPlayData, transitions, lastClipTime, clipTime, playDeltaTime, aniUpdate);
         var playCostTime;
         if (transition) {
-            var clipDuration = state.clip.length;
-            var clipEndTime = state.clipEndTime * clipDuration;
-            var exitTime = transition.exitTime * state._getDuration();
+            var clipEndTime = state._getClipActualEndTime();
+            var exitTime = transition.exitTime * state._getDuration() + state._getClipActualStartTime();
             if (isForwards) {
                 if (exitTime < lastClipTime) {
                     playCostTime = exitTime + clipEndTime - lastClipTime;
@@ -28763,7 +28766,7 @@ exports.AnimatorLayerBlendingMode = void 0;
                     playCostTime = exitTime - lastClipTime;
                 }
             } else {
-                var startTime = state.clipStartTime * clipDuration;
+                var startTime = state._getClipActualStartTime();
                 if (lastClipTime < exitTime) {
                     playCostTime = clipEndTime - exitTime + lastClipTime - startTime;
                 } else {
@@ -28825,20 +28828,22 @@ exports.AnimatorLayerBlendingMode = void 0;
         var lastDestClipTime = destPlayData.clipTime, lastDstPlayState = destPlayData.playState;
         var dstPlayCostTime;
         if (destPlayData.isForwards) {
-            dstPlayCostTime = lastDestClipTime + dstPlayDeltaTime > transitionDuration ? transitionDuration - lastDestClipTime : dstPlayDeltaTime;
+            // The time that has been played
+            var playedTime = destPlayData.playedTime;
+            dstPlayCostTime = playedTime + dstPlayDeltaTime > transitionDuration ? transitionDuration - playedTime : dstPlayDeltaTime;
         } else {
             // The time that has been played
-            var playedTime = destStateDuration - lastDestClipTime;
-            dstPlayCostTime = // -actualDestDeltaTime: The time that will be played, negative are meant to make ite be a periods
+            var playedTime1 = destPlayData.playedTime;
+            dstPlayCostTime = // -dstPlayDeltaTime: The time that will be played, negative are meant to make it be a periods
             // > transition: The time that will be played is enough to finish the transition
-            playedTime - dstPlayDeltaTime > transitionDuration ? // -(transitionDuration - playedTime)
-            playedTime - transitionDuration : dstPlayDeltaTime;
+            playedTime1 - dstPlayDeltaTime > transitionDuration ? // -(transitionDuration - playedTime)
+            playedTime1 - transitionDuration : dstPlayDeltaTime;
         }
         var actualCostTime = dstPlaySpeed === 0 ? deltaTime : dstPlayCostTime / dstPlaySpeed;
         var srcPlayCostTime = actualCostTime * srcPlaySpeed;
         srcPlayData.update(srcPlayCostTime);
         destPlayData.update(dstPlayCostTime);
-        var crossWeight = Math.abs(destPlayData.frameTime) / transitionDuration;
+        var crossWeight = Math.abs(destPlayData.playedTime) / transitionDuration;
         (crossWeight >= 1.0 - engineMath.MathUtil.zeroTolerance || transitionDuration === 0) && (crossWeight = 1.0);
         var crossFadeFinished = crossWeight === 1.0;
         if (crossFadeFinished) {
@@ -28888,18 +28893,20 @@ exports.AnimatorLayerBlendingMode = void 0;
         var lastDestClipTime = destPlayData.clipTime, lastPlayState = destPlayData.playState;
         var dstPlayCostTime;
         if (destPlayData.isForwards) {
-            dstPlayCostTime = lastDestClipTime + playDeltaTime > transitionDuration ? transitionDuration - lastDestClipTime : playDeltaTime;
+            // The time that has been played
+            var playedTime = destPlayData.playedTime;
+            dstPlayCostTime = playedTime + playDeltaTime > transitionDuration ? transitionDuration - playedTime : playDeltaTime;
         } else {
             // The time that has been played
-            var playedTime = stateDuration - lastDestClipTime;
+            var playedTime1 = destPlayData.playedTime;
             dstPlayCostTime = // -actualDestDeltaTime: The time that will be played, negative are meant to make ite be a periods
             // > transition: The time that will be played is enough to finish the transition
-            playedTime - playDeltaTime > transitionDuration ? // -(transitionDuration - playedTime)
-            playedTime - transitionDuration : playDeltaTime;
+            playedTime1 - playDeltaTime > transitionDuration ? // -(transitionDuration - playedTime)
+            playedTime1 - transitionDuration : playDeltaTime;
         }
         var actualCostTime = playSpeed === 0 ? deltaTime : dstPlayCostTime / playSpeed;
         destPlayData.update(dstPlayCostTime);
-        var crossWeight = Math.abs(destPlayData.frameTime) / transitionDuration;
+        var crossWeight = Math.abs(destPlayData.playedTime) / transitionDuration;
         (crossWeight >= 1.0 - engineMath.MathUtil.zeroTolerance || transitionDuration === 0) && (crossWeight = 1.0);
         var crossFadeFinished = crossWeight === 1.0;
         if (crossFadeFinished) {
@@ -29027,10 +29034,9 @@ exports.AnimatorLayerBlendingMode = void 0;
     _proto._checkSubTransition = function _checkSubTransition(layerIndex, layerData, layer, playState, transitions, lastClipTime, curClipTime, aniUpdate) {
         var state = playState.state;
         var transitionIndex = playState.currentTransitionIndex;
-        var duration = state._getDuration();
         for(var n = transitions.length; transitionIndex < n; transitionIndex++){
             var transition = transitions[transitionIndex];
-            var exitTime = transition.exitTime * duration;
+            var exitTime = transition.exitTime * state._getDuration() + state._getClipActualStartTime();
             if (exitTime > curClipTime) {
                 break;
             }
@@ -29050,10 +29056,9 @@ exports.AnimatorLayerBlendingMode = void 0;
     _proto._checkBackwardsSubTransition = function _checkBackwardsSubTransition(layerIndex, layerData, layer, playState, transitions, lastClipTime, curClipTime, aniUpdate) {
         var state = playState.state;
         var transitionIndex = playState.currentTransitionIndex;
-        var duration = playState.state._getDuration();
         for(; transitionIndex >= 0; transitionIndex--){
             var transition = transitions[transitionIndex];
-            var exitTime = transition.exitTime * duration;
+            var exitTime = transition.exitTime * state._getDuration() + state._getClipActualStartTime();
             if (exitTime < curClipTime) {
                 break;
             }
@@ -29684,6 +29689,16 @@ function _possible_constructor_return(self, call) {
             }
         }
     };
+    /**
+   * @internal
+   */ _proto._getClipActualStartTime = function _getClipActualStartTime() {
+        return this._clipStartTime * this.clip.length;
+    };
+    /**
+   * @internal
+   */ _proto._getClipActualEndTime = function _getClipActualEndTime() {
+        return this._clipEndTime * this.clip.length;
+    };
     _create_class(AnimatorState, [
         {
             key: "transitions",
@@ -31435,6 +31450,7 @@ __decorate([
 
 var MainModule = /*#__PURE__*/ function() {
     function MainModule(generator) {
+        this._tempVector40 = new engineMath.Vector4();
         /** The duration of the Particle Generator in seconds. */ this.duration = 5.0;
         /** Specifies whether the Particle Generator loops. */ this.isLoop = true;
         /** Start delay in seconds. */ this.startDelay = new ParticleCompositeCurve(0);
@@ -31456,7 +31472,6 @@ var MainModule = /*#__PURE__*/ function() {
         this._gravityModifierRand = new engineMath.Rand(0, ParticleRandomSubSeeds.GravityModifier);
         this._startSize3D = false;
         this._simulationSpace = exports.ParticleSimulationSpace.Local;
-        this._gravity = new engineMath.Vector3();
         this._generator = generator;
         this.startLifetime = new ParticleCompositeCurve(5);
         this.startSpeed = new ParticleCompositeCurve(5);
@@ -31496,8 +31511,7 @@ var MainModule = /*#__PURE__*/ function() {
             case exports.ParticleSimulationSpace.Local:
                 shaderData.setVector3(MainModule._worldPosition, transform.worldPosition);
                 var worldRotation = transform.worldRotationQuaternion;
-                var worldRotationV4 = MainModule._tempVector40;
-                worldRotationV4.copyFrom(worldRotation);
+                var worldRotationV4 = this._tempVector40.copyFrom(worldRotation); // Maybe shaderData should support Quaternion
                 shaderData.setVector4(MainModule._worldRotation, worldRotationV4);
                 break;
             case exports.ParticleSimulationSpace.World:
@@ -31521,10 +31535,7 @@ var MainModule = /*#__PURE__*/ function() {
                 shaderData.setVector3(MainModule._sizeScale, MainModule._vector3One);
                 break;
         }
-        var particleGravity = this._gravity;
-        var gravityModifierValue = this.gravityModifier.evaluate(undefined, this._gravityModifierRand.random());
-        engineMath.Vector3.scale(renderer.scene.physics.gravity, gravityModifierValue, particleGravity);
-        shaderData.setVector3(MainModule._gravity, particleGravity);
+        shaderData.setVector3(MainModule._gravity, renderer.scene.physics.gravity);
         shaderData.setInt(MainModule._simulationSpace, this.simulationSpace);
         shaderData.setFloat(MainModule._startRotation3D, +this.startRotation3D);
         shaderData.setInt(MainModule._scaleMode, this.scalingMode);
@@ -31692,9 +31703,6 @@ var MainModule = /*#__PURE__*/ function() {
     ]);
     return MainModule;
 }();
-(function() {
-    MainModule._tempVector40 = new engineMath.Vector4();
-})();
 (function() {
     MainModule._vector3One = new engineMath.Vector3(1, 1, 1);
 })();
@@ -31779,9 +31787,6 @@ __decorate([
 __decorate([
     ignoreClone
 ], MainModule.prototype, "_generator", void 0);
-__decorate([
-    ignoreClone
-], MainModule.prototype, "_gravity", void 0);
 
 /**
  * Rotate particles throughout their lifetime.
@@ -33051,8 +33056,15 @@ __decorate([
         }
         // Start speed
         instanceVertices[offset + 18] = startSpeed;
-        // Unused, Color, size, rotation,
-        // instanceVertices[offset + 19] = rand.random();
+        // Gravity, unused, size, rotation
+        switch(main.gravityModifier.mode){
+            case exports.ParticleCurveMode.Constant:
+                instanceVertices[offset + 19] = main.gravityModifier.constant;
+                break;
+            case exports.ParticleCurveMode.TwoConstants:
+                instanceVertices[offset + 19] = main.gravityModifier.evaluate(undefined, main._gravityModifierRand.random());
+                break;
+        }
         var colorOverLifetime = this.colorOverLifetime;
         if (colorOverLifetime.enabled && colorOverLifetime.color.mode === exports.ParticleGradientMode.TwoGradients) {
             instanceVertices[offset + 20] = colorOverLifetime._colorGradientRand.random();