Skip to content

Commit

Permalink
hopefully formatting is good now
Browse files Browse the repository at this point in the history
  • Loading branch information
bomba1749 authored Mar 13, 2024
1 parent b7b865c commit 7752540
Showing 1 changed file with 6 additions and 4 deletions.
10 changes: 6 additions & 4 deletions src/Game/AI/AI/aiAirOctaFlyUp.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,11 @@ void AirOctaFlyUp::calc_() {
}
auto dt = ksys::VFR::instance()->getDeltaTime();
mElapsedTime += dt;
auto fly_up_turning_pts = (sead::Mathf::min(1.0f, mElapsedTime / *mFlyUpDuration_s) * 2.f) - 1.f;
auto fly_up_multiplier = fly_up_turning_pts < 1.f ? sead::Mathf::exp((fly_up_turning_pts * 2.f) - 1.f * 10.f) :
2.f - sead::Mathf::exp((fly_up_turning_pts * 2.f) - 1.f * -10.f);
auto fly_up_turning_pts =
(sead::Mathf::min(1.0f, mElapsedTime / *mFlyUpDuration_s) * 2.f) - 1.f;
auto fly_up_multiplier = fly_up_turning_pts < 1.f ?
sead::Mathf::exp((fly_up_turning_pts * 2.f) - 1.f * 10.f) :
2.f - sead::Mathf::exp((fly_up_turning_pts * 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];
Expand Down Expand Up @@ -102,7 +104,7 @@ void AirOctaFlyUp::leave_() {
data_mgr->changeOctasYheightMaybe();
}
}

// NON_MATCHING: addresses that variables are loaded from
void AirOctaFlyUp::loadParams_() {
getStaticParam(&mFlyUpDuration_s, "FlyUpDuration");
getDynamicParam(&mTargetDistance_d, "TargetDistance");
Expand Down

0 comments on commit 7752540

Please sign in to comment.