diff options
Diffstat (limited to 'src/JSystem/J3DGraphAnimator/J3DAnimation.cpp')
| -rw-r--r-- | src/JSystem/J3DGraphAnimator/J3DAnimation.cpp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/JSystem/J3DGraphAnimator/J3DAnimation.cpp b/src/JSystem/J3DGraphAnimator/J3DAnimation.cpp index 0fa5ac9e..fc2c58b4 100644 --- a/src/JSystem/J3DGraphAnimator/J3DAnimation.cpp +++ b/src/JSystem/J3DGraphAnimator/J3DAnimation.cpp @@ -9,7 +9,7 @@ /* 802EF5D8-802EF608 .text init__12J3DFrameCtrlFs */ void J3DFrameCtrl::init(s16 end) { - mAttribute = 2; + mAttribute = EMode_LOOP; mState = 0; mStart = 0; mEnd = end; @@ -24,8 +24,8 @@ BOOL J3DFrameCtrl::checkPass(f32 pass_frame) { f32 next_frame = cur_frame + mRate; switch (mAttribute) { - case LOOP_ONCE_e: - case LOOP_ONCE_RESET_e: + case EMode_NONE: + case EMode_RESET: if (next_frame < mStart) { next_frame = mStart; } @@ -46,7 +46,7 @@ BOOL J3DFrameCtrl::checkPass(f32 pass_frame) { return true; } return false; - case LOOP_REPEAT_e: + case EMode_LOOP: if (cur_frame < mStart) { while (next_frame < mStart) { if (mLoop - mStart <= 0.0f) { @@ -110,8 +110,8 @@ BOOL J3DFrameCtrl::checkPass(f32 pass_frame) { return true; } return false; - case LOOP_MIRROR_ONCE_e: - case LOOP_MIRROR_REPEAT_e: + case EMode_REVERSE: + case EMode_LOOP_REVERSE: if (next_frame >= mEnd) { next_frame = mEnd - 0.001f; } @@ -142,7 +142,7 @@ void J3DFrameCtrl::update() { mState = 0; mFrame += mRate; switch (mAttribute) { - case LOOP_ONCE_e: + case EMode_NONE: if (mFrame < mStart) { mFrame = mStart; mRate = 0.0f; @@ -154,7 +154,7 @@ void J3DFrameCtrl::update() { mState |= 1; } break; - case LOOP_ONCE_RESET_e: + case EMode_RESET: if (mFrame < mStart) { mFrame = mStart; mRate = 0.0f; @@ -166,7 +166,7 @@ void J3DFrameCtrl::update() { mState |= 1; } break; - case LOOP_REPEAT_e: + case EMode_LOOP: while (mFrame < mStart) { mState |= 2; if (mLoop - mStart <= 0.0f) { @@ -182,7 +182,7 @@ void J3DFrameCtrl::update() { mFrame -= mEnd - mLoop; } break; - case LOOP_MIRROR_ONCE_e: + case EMode_REVERSE: if (mFrame >= mEnd) { mFrame = mEnd - 0.001f; mRate = -mRate; @@ -193,7 +193,7 @@ void J3DFrameCtrl::update() { mState |= 1; } break; - case LOOP_MIRROR_REPEAT_e: + case EMode_LOOP_REVERSE: if (mFrame >= mEnd) { mFrame = mEnd - 0.001f; mRate = -mRate; |
