Skip to content

Commit

Permalink
fixed naming issues
Browse files Browse the repository at this point in the history
  • Loading branch information
bomba1749 authored Oct 18, 2023
1 parent 12737fc commit b87c223
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions src/Game/AI/AI/aiAirOctaFlyUp.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,10 @@ void AirOctaFlyUp::calc_() {
}
auto dt = ksys::VFR::instance()->getDeltaTime();
mElapsedTime += dt;
auto min = (sead::Mathf::min(1.0f, mElapsedTime / *mFlyUpDuration_s) * 2.f) - 1.f;
auto fly_up_cycles = min < 1.f ? sead::Mathf::exp((min * 2.f) - 1.f * 10.f) :
2.f - sead::Mathf::exp((min * 2.f) - 1.f * -10.f);
data_mgr->unk_114 = fly_up_cycles * 0.5f * *mTargetDistance_d;
auto fly_up_cycles = (sead::Mathf::min(1.0f, mElapsedTime / *mFlyUpDuration_s) * 2.f) - 1.f;
auto fly_up_multiplier = fly_up_cycles < 1.f ? sead::Mathf::exp((fly_up_cycles * 2.f) - 1.f * 10.f) :
2.f - sead::Mathf::exp((fly_up_cycles * 2.f) - 1.f * -10.f);
data_mgr->unk_114 = fly_up_multiplier * 0.5f * *mTargetDistance_d;
data_mgr->changeOctasYheightMaybe();
auto y = getActor()->getMtx().m[1][3];
if (isCurrentChild("終了")) { // "End"
Expand All @@ -45,7 +45,7 @@ void AirOctaFlyUp::calc_() {
return;
}
}
if ((fly_up_cycles * 0.5f >= 1.f && y >= getDataMgr()->vec_F8.y) ||
if ((fly_up_multiplier * 0.5f >= 1.f && y >= getDataMgr()->vec_F8.y) ||
mElapsedTime >= (*mFlyUpDuration_s * 3.0f)) {
ksys::act::ActorConstDataAccess linkData;
if (ksys::act::acquireActor(&getDataMgr()->mBaseProcLink, &linkData)) {
Expand Down

0 comments on commit b87c223

Please sign in to comment.