diff --git a/configure.py b/configure.py index 40cbea48..7a85da14 100755 --- a/configure.py +++ b/configure.py @@ -1193,7 +1193,7 @@ def MatchingFor(*versions): Object(Matching, "Pack/RPKernel/RPSysMiddleDBGenInfo.cpp"), Object(Matching, "Pack/RPKernel/RPSysMiddleDB.cpp"), Object(Matching, "Pack/RPKernel/RPSysLytAllocator.cpp"), - Object(NonMatching, "Pack/RPKernel/RPSysLytDynamicAnm.cpp"), + Object(Matching, "Pack/RPKernel/RPSysLytDynamicAnm.cpp"), Object(Matching, "Pack/RPKernel/RPSysKokeshiIterater.cpp"), Object(NonMatching, "Pack/RPKernel/RPSysCursorDrawMgr.cpp"), Object(Matching, "Pack/RPKernel/RPSysStringUtility.cpp"), diff --git a/src/Pack/RPKernel/RPSysLytDynamicAnm.cpp b/src/Pack/RPKernel/RPSysLytDynamicAnm.cpp index e156f7d8..0db5158f 100644 --- a/src/Pack/RPKernel/RPSysLytDynamicAnm.cpp +++ b/src/Pack/RPKernel/RPSysLytDynamicAnm.cpp @@ -22,8 +22,13 @@ RPSysLytDynamicAnm::RPSysLytDynamicAnm(nw4r::lyt::Pane* pParent, mAlpha = mpParent->GetAlpha(); const nw4r::math::VEC3& rParentPos = mpParent->GetTranslate(); - mStartPos.set(rParentPos.x, rParentPos.y, rParentPos.z); - mNowPos.set(mStartPos.x, mStartPos.y, mStartPos.z); + mStartPos.x = rParentPos.x; + mStartPos.y = rParentPos.y; + mStartPos.z = rParentPos.z; + + mNowPos.x = mStartPos.x; + mNowPos.y = mStartPos.y; + mNowPos.z = mStartPos.z; mEndFrame = frameNum; mStartFrame = 0; @@ -220,8 +225,9 @@ void RPSysLytDynamicAnm::calc() { target = nw4r::math::SinRad(rad) * 0.5f + 0.5f; } - mpParent->SetTranslate(mNowPos * (1.0f - target) + - mStartPos * target); + EGG::Vector3f translate = + mNowPos * (1.0f - target) + mStartPos * target; + mpParent->SetTranslate(translate); mpParent->SetAlpha(mAlpha * amount); } else { @@ -248,8 +254,9 @@ void RPSysLytDynamicAnm::calc() { target = nw4r::math::SinRad(rad) * 0.5f + 0.5f; } - mpParent->SetTranslate(mNowPos * target + - mStartPos * (1.0f - target)); + EGG::Vector3f translate = + mNowPos * target + mStartPos * (1.0f - target); + mpParent->SetTranslate(translate); mpParent->SetAlpha(mAlpha * (1.0f - amount)); } else {