Skip to content

Commit

Permalink
refactor: opt code
Browse files Browse the repository at this point in the history
  • Loading branch information
GuoLei1990 committed Sep 10, 2024
1 parent 69ee2c4 commit 2e63e45
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 18 deletions.
32 changes: 16 additions & 16 deletions packages/core/src/animation/Animator.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1003,7 +1003,7 @@ export class Animator extends Component {
layer: AnimatorControllerLayer,
isForwards: boolean,
playData: AnimatorStatePlayData,
transitionCollection: AnimatorStateTransitionCollection,
transitions: AnimatorStateTransitionCollection,
lastClipTime: number,
clipTime: number,
deltaTime: number,
Expand All @@ -1022,7 +1022,7 @@ export class Animator extends Component {
layerData,
layer,
playData,
transitionCollection,
transitions,
lastClipTime,
endTime,
checkStateMachineTransition,
Expand All @@ -1039,7 +1039,7 @@ export class Animator extends Component {
layerData,
layer,
playData,
transitionCollection,
transitions,
startTime,
clipTime,
checkStateMachineTransition,
Expand All @@ -1052,7 +1052,7 @@ export class Animator extends Component {
layerData,
layer,
playData,
transitionCollection,
transitions,
lastClipTime,
clipTime,
checkStateMachineTransition,
Expand All @@ -1067,24 +1067,24 @@ export class Animator extends Component {
layerData,
layer,
playData,
transitionCollection,
transitions,
lastClipTime,
startTime,
checkStateMachineTransition,
aniUpdate
);
if (!targetTransition) {
if (checkStateMachineTransition) {
layerData.anyTransitionIndex = transitionCollection.count - 1;
layerData.anyTransitionIndex = transitions.count - 1;
} else {
playData.currentTransitionIndex = transitionCollection.count - 1;
playData.currentTransitionIndex = transitions.count - 1;
}
targetTransition = this._checkBackwardsSubTransition(
layerIndex,
layerData,
layer,
playData,
transitionCollection,
transitions,
clipTime,
endTime,
checkStateMachineTransition,
Expand All @@ -1097,7 +1097,7 @@ export class Animator extends Component {
layerData,
layer,
playData,
transitionCollection,
transitions,
lastClipTime,
clipTime,
checkStateMachineTransition,
Expand All @@ -1114,7 +1114,7 @@ export class Animator extends Component {
layerData: AnimatorLayerData,
layer: AnimatorControllerLayer,
playData: AnimatorStatePlayData,
transitionCollection: AnimatorStateTransitionCollection,
transitions: AnimatorStateTransitionCollection,
lastClipTime: number,
curClipTime: number,
checkStateMachineTransition: boolean,
Expand All @@ -1123,9 +1123,9 @@ export class Animator extends Component {
const { state } = playData;
let transitionIndex = checkStateMachineTransition ? layerData.anyTransitionIndex : playData.currentTransitionIndex;
const duration = state._getDuration();
const isSoloMode = transitionCollection.isSoloMode;
for (let n = transitionCollection.count; transitionIndex < n; transitionIndex++) {
const transition = transitionCollection.get(transitionIndex);
const isSoloMode = transitions.isSoloMode;
for (let n = transitions.count; transitionIndex < n; transitionIndex++) {
const transition = transitions.get(transitionIndex);
const hasExitTime = transition.hasExitTime;
const exitTime = transition.exitTime * duration;
if (hasExitTime && exitTime > curClipTime) {
Expand Down Expand Up @@ -1160,7 +1160,7 @@ export class Animator extends Component {
layerData: AnimatorLayerData,
layer: AnimatorControllerLayer,
playState: AnimatorStatePlayData,
transitionCollection: AnimatorStateTransitionCollection,
transitions: AnimatorStateTransitionCollection,
lastClipTime: number,
curClipTime: number,
checkStateMachineTransition: boolean,
Expand All @@ -1169,9 +1169,9 @@ export class Animator extends Component {
const { state } = playState;
let transitionIndex = checkStateMachineTransition ? layerData.anyTransitionIndex : playState.currentTransitionIndex;
const duration = playState.state._getDuration();
const isSoloMode = transitionCollection.isSoloMode;
const isSoloMode = transitions.isSoloMode;
for (; transitionIndex >= 0; transitionIndex--) {
const transition = transitionCollection.get(transitionIndex);
const transition = transitions.get(transitionIndex);
const hasExitTime = transition.hasExitTime;
const exitTime = transition.exitTime * duration;
if (hasExitTime && exitTime < curClipTime) {
Expand Down
4 changes: 2 additions & 2 deletions packages/core/src/animation/AnimatorStateMachine.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ export class AnimatorStateMachine {
defaultState: AnimatorState;

/** @internal */
_entryTransitionCollection: AnimatorStateTransitionCollection = new AnimatorStateTransitionCollection();
_entryTransitionCollection = new AnimatorStateTransitionCollection();
/** @internal */
_anyStateTransitionCollection: AnimatorStateTransitionCollection = new AnimatorStateTransitionCollection();
_anyStateTransitionCollection = new AnimatorStateTransitionCollection();

private _statesMap: AnimatorStateMap = {};

Expand Down

0 comments on commit 2e63e45

Please sign in to comment.