mirror/botw
1
0
Fork 0
mirror of https://github.com/zeldaret/botw synced 2026-08-25 15:26:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

Update misc files to match sead math changes

Browse Source
This commit is contained in:
ThePixelGamer
2021-10-06 18:02:53 -05:00
parent a82333ef90
commit 20df9e7c7d
11 changed files with 28 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/KingSystem/System/VFR.h
+3 -3
View File
@@ -95,7 +95,7 @@ public:
const auto f = getLerpFactor(t);
const auto max_d = instance()->getDeltaTime() * max_delta;
const auto diff = b - *value;
const auto d = f * sead::absf(diff);
const auto d = f * sead::Mathf::abs(diff);
if (d > max_d)
*value += diff < 0.0 ? -max_d : max_d;
else
@@ -109,9 +109,9 @@ public:
const auto min_d = instance()->getDeltaTime() * min_delta;
const auto diff = b - *value;
const auto d = f * sead::absf(diff);
const auto d = f * sead::Mathf::abs(diff);
if (sead::absf(diff) <= min_d) {
if (sead::Mathf::abs(diff) <= min_d) {
*value = b;
return true;
}
src/KingSystem/System/VFRValue.cpp
+4 -4
View File
@@ -75,7 +75,7 @@ void VFRVec3f::lerp(const sead::Vector3f& b, f32 t) {
bool VFRVec3f::chase(const sead::Vector3f& target, f32 t) {
const auto delta = VFR::instance()->getDeltaTime() * t;
const auto diff = target - value;
const auto norm = sead::norm2(diff);
const auto norm = diff.length();
if (norm <= delta) {
sead::MemUtil::copy(&value, &target, sizeof(value));
@@ -101,12 +101,12 @@ void VFRValue::setToMin(const f32& min) {
void VFRValue::clamp(const f32& min, const f32& max) {
const auto a = min;
const auto b = max;
value = sead::clamp(value, a, b);
value = sead::Mathf::clamp(value, a, b);
}
void VFRVec3f::normalize(f32 new_norm) {
if (sead::norm2(value) > new_norm) {
const auto norm = sead::norm2(value);
if (value.length() > new_norm) {
const auto norm = value.length();
if (norm > 0.0)
value *= new_norm / norm;
}