@galacean/engine-core 1.3.5 → 1.3.7

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#endif\n#ifdef RENDERER_TSA_FRAME_RANDOM_CURVES\nuniform vec2 renderer_TSAFrameMinCurve[4];\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 totalULength=frame*renderer_TSATillingParams.x;float floorTotalULength=floor(totalULength);uv.x+=totalULength-floorTotalULength;uv.y+=floorTotalULength*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 floorTotalULength=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
 
@@ -10759,6 +10759,9 @@ var SubRenderElement = /*#__PURE__*/ function() {
 __decorate([
     assignmentClone
 ], SpriteMask.prototype, "influenceLayers", void 0);
+__decorate([
+    ignoreClone
+], SpriteMask.prototype, "_renderElement", void 0);
 __decorate([
     ignoreClone
 ], SpriteMask.prototype, "_subChunk", void 0);
@@ -20929,6 +20932,8 @@ var Collision = function Collision() {
         _this._setUpDirection = _this._setUpDirection.bind(_assert_this_initialized(_this));
         //@ts-ignore
         _this._upDirection._onValueChanged = _this._setUpDirection;
+        // sync world position to physical space
+        _this._onUpdate();
         return _this;
     }
     var _proto = CharacterController.prototype;
@@ -20939,7 +20944,9 @@ var Collision = function Collision() {
    * @param elapsedTime - Time elapsed since last call
    * @return flags - The ControllerCollisionFlag
    */ _proto.move = function move(disp, minDist, elapsedTime) {
-        return this._nativeCollider.move(disp, minDist, elapsedTime);
+        var flags = this._nativeCollider.move(disp, minDist, elapsedTime);
+        this._syncWorldPositionFromPhysicalSpace();
+        return flags;
     };
     /**
    * Add collider shape on this controller.
@@ -20975,8 +20982,7 @@ var Collision = function Collision() {
     /**
    * @internal
    */ _proto._onLateUpdate = function _onLateUpdate() {
-        var position = this.entity.transform.worldPosition;
-        this._nativeCollider.getWorldPosition(position);
+        this._syncWorldPositionFromPhysicalSpace();
         this._updateFlag.flag = false;
     };
     /**
@@ -20999,6 +21005,9 @@ var Collision = function Collision() {
             physics._removeColliderShape(shapes[i]);
         }
     };
+    _proto._syncWorldPositionFromPhysicalSpace = function _syncWorldPositionFromPhysicalSpace() {
+        this._nativeCollider.getWorldPosition(this.entity.transform.worldPosition);
+    };
     _proto._setUpDirection = function _setUpDirection() {
         this._nativeCollider.setUpDirection(this._upDirection);
     };
@@ -28683,7 +28692,9 @@ exports.AnimatorLayerBlendingMode = void 0;
         // Precalculate to get the transition
         srcPlayData.update(playDeltaTime);
         var clipTime = srcPlayData.clipTime, isForwards = srcPlayData.isForwards;
-        var transition = this._applyTransitionsByCondition(layerIndex, layerData, layer, state, layer.stateMachine.anyStateTransitions, aniUpdate) || this._applyStateTransitions(layerIndex, layerData, layer, isForwards, srcPlayData, state.transitions, lastClipTime, clipTime, playDeltaTime, aniUpdate);
+        var transitions = state.transitions;
+        var anyStateTransitions = layer.stateMachine.anyStateTransitions;
+        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;
@@ -28767,7 +28778,7 @@ exports.AnimatorLayerBlendingMode = void 0;
             playedTime - dstPlayDeltaTime > transitionDuration ? // -(transitionDuration - playedTime)
             playedTime - transitionDuration : dstPlayDeltaTime;
         }
-        var actualCostTime = dstPlaySpeed === 0 ? 0 : dstPlayCostTime / dstPlaySpeed;
+        var actualCostTime = dstPlaySpeed === 0 ? deltaTime : dstPlayCostTime / dstPlaySpeed;
         var srcPlayCostTime = actualCostTime * srcPlaySpeed;
         srcPlayData.update(srcPlayCostTime);
         destPlayData.update(dstPlayCostTime);
@@ -28775,6 +28786,7 @@ exports.AnimatorLayerBlendingMode = void 0;
         (crossWeight >= 1.0 - engineMath.MathUtil.zeroTolerance || transitionDuration === 0) && (crossWeight = 1.0);
         var crossFadeFinished = crossWeight === 1.0;
         if (crossFadeFinished) {
+            srcPlayData.playState = AnimatorStatePlayState.Finished;
             this._preparePlayOwner(layerData, destState);
             this._evaluatePlayingState(destPlayData, weight, additive, aniUpdate);
         } else {
@@ -28829,7 +28841,7 @@ exports.AnimatorLayerBlendingMode = void 0;
             playedTime - playDeltaTime > transitionDuration ? // -(transitionDuration - playedTime)
             playedTime - transitionDuration : playDeltaTime;
         }
-        var actualCostTime = playSpeed === 0 ? 0 : dstPlayCostTime / playSpeed;
+        var actualCostTime = playSpeed === 0 ? deltaTime : dstPlayCostTime / playSpeed;
         destPlayData.update(dstPlayCostTime);
         var crossWeight = Math.abs(destPlayData.frameTime) / transitionDuration;
         (crossWeight >= 1.0 - engineMath.MathUtil.zeroTolerance || transitionDuration === 0) && (crossWeight = 1.0);
@@ -28869,14 +28881,16 @@ exports.AnimatorLayerBlendingMode = void 0;
         }
     };
     _proto._updateFinishedState = function _updateFinishedState(layerIndex, layerData, layer, weight, additive, deltaTime, aniUpdate) {
-        var stateMachine = layer.stateMachine;
+        layer.stateMachine;
         var playData = layerData.srcPlayData;
         var state = playData.state;
         var actualSpeed = state.speed * this.speed;
         var actualDeltaTime = actualSpeed * deltaTime;
         playData.updateOrientation(actualDeltaTime);
         var clipTime = playData.clipTime, isForwards = playData.isForwards;
-        var transition = this._applyTransitionsByCondition(layerIndex, layerData, layer, state, stateMachine.anyStateTransitions, aniUpdate) || this._applyStateTransitions(layerIndex, layerData, layer, isForwards, playData, state.transitions, clipTime, clipTime, actualDeltaTime, aniUpdate);
+        var transitions = state.transitions;
+        var anyStateTransitions = layer.stateMachine.anyStateTransitions;
+        var transition = anyStateTransitions.length && this._applyTransitionsByCondition(layerIndex, layerData, layer, state, anyStateTransitions, aniUpdate) || transitions.length && this._applyStateTransitions(layerIndex, layerData, layer, isForwards, playData, transitions, clipTime, clipTime, actualDeltaTime, aniUpdate);
         if (transition) {
             this._updateState(layerIndex, layerData, layer, deltaTime, aniUpdate);
         } else {
@@ -32199,7 +32213,6 @@ __decorate([
     function TextureSheetAnimationModule() {
         var _this;
         _this = ParticleGeneratorModule1.apply(this, arguments) || this;
-        /** Start frame of the texture sheet. */ _this.startFrame = new ParticleCompositeCurve(0);
         /** Frame over time curve of the texture sheet. */ _this.frameOverTime = new ParticleCompositeCurve(new ParticleCurve(new CurveKey(0, 0), new CurveKey(1, 1)));
         /** Texture sheet animation type. */ _this.type = /** Animate over the whole texture sheet from left to right, top to bottom. */ 0;
         /** Cycle count. */ _this.cycleCount = 1;
@@ -32229,7 +32242,7 @@ __decorate([
                 shaderData.setVector3(TextureSheetAnimationModule._tillingParamsProperty, this._tillingInfo);
             }
         }
-        this._textureSheetMacro = this._enableMacro(shaderData, this._textureSheetMacro, frameMacro);
+        this._frameCurveMacro = this._enableMacro(shaderData, this._frameCurveMacro, frameMacro);
     };
     /**
    * @internal
@@ -32259,20 +32272,17 @@ __decorate([
     TextureSheetAnimationModule._frameRandomCurvesMacro = ShaderMacro.getByName("RENDERER_TSA_FRAME_RANDOM_CURVES");
 })();
 (function() {
-    TextureSheetAnimationModule._cycleCountProperty = ShaderProperty.getByName("renderer_TSACycles");
+    TextureSheetAnimationModule._frameMinCurveProperty = ShaderProperty.getByName("renderer_TSAFrameMinCurve");
 })();
 (function() {
-    TextureSheetAnimationModule._tillingParamsProperty = ShaderProperty.getByName("renderer_TSATillingParams");
+    TextureSheetAnimationModule._frameMaxCurveProperty = ShaderProperty.getByName("renderer_TSAFrameMaxCurve");
 })();
 (function() {
-    TextureSheetAnimationModule._frameMinCurveProperty = ShaderProperty.getByName("renderer_TSAFrameMinCurve");
+    TextureSheetAnimationModule._cycleCountProperty = ShaderProperty.getByName("renderer_TSACycles");
 })();
 (function() {
-    TextureSheetAnimationModule._frameMaxCurveProperty = ShaderProperty.getByName("renderer_TSAFrameMaxCurve");
+    TextureSheetAnimationModule._tillingParamsProperty = ShaderProperty.getByName("renderer_TSATillingParams");
 })();
-__decorate([
-    deepClone
-], TextureSheetAnimationModule.prototype, "startFrame", void 0);
 __decorate([
     deepClone
 ], TextureSheetAnimationModule.prototype, "frameOverTime", void 0);
@@ -32287,7 +32297,7 @@ __decorate([
 ], TextureSheetAnimationModule.prototype, "_tiling", void 0);
 __decorate([
     ignoreClone
-], TextureSheetAnimationModule.prototype, "_textureSheetMacro", void 0);
+], TextureSheetAnimationModule.prototype, "_frameCurveMacro", void 0);
 var TextureSheetAnimationType;
 (function(TextureSheetAnimationType) {
     TextureSheetAnimationType[TextureSheetAnimationType["WholeSheet"] = 0] = "WholeSheet";
@@ -33021,12 +33031,18 @@ __decorate([
             instanceVertices[offset + 33] = rot.w;
         }
         // Simulation UV
-        if (this.textureSheetAnimation.enabled) {
-            var tillingInfo = this.textureSheetAnimation._tillingInfo;
-            instanceVertices[offset + ParticleBufferUtils.simulationUVOffset] = tillingInfo.x;
-            instanceVertices[offset + 35] = tillingInfo.y;
-            instanceVertices[offset + 36] = 0;
-            instanceVertices[offset + 37] = 0;
+        if (textureSheetAnimation.enabled) {
+            var frameOverTime = textureSheetAnimation.frameOverTime;
+            var _textureSheetAnimation__tillingInfo = textureSheetAnimation._tillingInfo, x = _textureSheetAnimation__tillingInfo.x, y = _textureSheetAnimation__tillingInfo.y, z = _textureSheetAnimation__tillingInfo.z;
+            var tileRow = 0;
+            if (frameOverTime.mode === exports.ParticleCurveMode.Constant || frameOverTime.mode === exports.ParticleCurveMode.TwoConstants) {
+                tileRow = Math.floor(frameOverTime.evaluate(undefined, textureSheetAnimation._frameOverTimeRand.random()) * z) * x;
+            }
+            var tileRowIndex = Math.floor(tileRow);
+            instanceVertices[offset + ParticleBufferUtils.simulationUVOffset] = x;
+            instanceVertices[offset + 35] = y;
+            instanceVertices[offset + 36] = tileRow - tileRowIndex;
+            instanceVertices[offset + 37] = tileRowIndex * y;
         } else {
             instanceVertices[offset + ParticleBufferUtils.simulationUVOffset] = 1;
             instanceVertices[offset + 35] = 1;