Skip to content

Commit e6a170e

Browse files
committed
feat: opt code
1 parent e40be2d commit e6a170e

File tree

1 file changed

+5
-8
lines changed

1 file changed

+5
-8
lines changed

packages/core/src/animation/Animator.ts

+5-8
Original file line numberDiff line numberDiff line change
@@ -608,8 +608,7 @@ export class Animator extends Component {
608608

609609
if (needSwitchLayerState) {
610610
const remainDeltaTime = deltaTime - costTime / actualSpeed;
611-
remainDeltaTime > MathUtil.zeroTolerance &&
612-
this._updateState(layerIndex, layerData, layer, remainDeltaTime, aniUpdate);
611+
remainDeltaTime >= 0 && this._updateState(layerIndex, layerData, layer, remainDeltaTime, aniUpdate);
613612
}
614613
}
615614

@@ -696,7 +695,7 @@ export class Animator extends Component {
696695
destPlayData.update(destCostTime);
697696

698697
let crossWeight = Math.abs(destPlayData.frameTime) / transitionDuration;
699-
(crossWeight >= 1.0 - MathUtil.zeroTolerance || transitionDuration === 0) && (crossWeight = 1.0);
698+
(crossWeight >= 1.0 || transitionDuration === 0) && (crossWeight = 1.0);
700699

701700
const crossFadeFinished = crossWeight === 1.0;
702701

@@ -728,8 +727,7 @@ export class Animator extends Component {
728727
if (crossFadeFinished) {
729728
this._updateCrossFadeData(layerData);
730729
const remainDeltaTime = deltaTime - costTime;
731-
remainDeltaTime > MathUtil.zeroTolerance &&
732-
this._updateState(layerIndex, layerData, layer, remainDeltaTime, aniUpdate);
730+
remainDeltaTime >= 0 && this._updateState(layerIndex, layerData, layer, remainDeltaTime, aniUpdate);
733731
}
734732
}
735733

@@ -821,7 +819,7 @@ export class Animator extends Component {
821819
destPlayData.update(destCostTime);
822820

823821
let crossWeight = Math.abs(destPlayData.frameTime) / transitionDuration;
824-
(crossWeight >= 1.0 - MathUtil.zeroTolerance || transitionDuration === 0) && (crossWeight = 1.0);
822+
(crossWeight >= 1.0 || transitionDuration === 0) && (crossWeight = 1.0);
825823

826824
const crossFadeFinished = crossWeight === 1.0;
827825

@@ -844,8 +842,7 @@ export class Animator extends Component {
844842
if (crossFadeFinished) {
845843
this._updateCrossFadeData(layerData);
846844
const remainDeltaTime = deltaTime - costTime;
847-
remainDeltaTime > MathUtil.zeroTolerance &&
848-
this._updateState(layerIndex, layerData, layer, remainDeltaTime, aniUpdate);
845+
remainDeltaTime >= 0 && this._updateState(layerIndex, layerData, layer, remainDeltaTime, aniUpdate);
849846
}
850847
}
851848

0 commit comments

Comments
 (0)