Update libraries and adjust code to match again

zeldaret · Jul 26, 2024 · de0fd08 · de0fd08
1 parent 96f611f
commit de0fd08
Show file tree

Hide file tree

Showing 10 changed files with 35 additions and 41 deletions.
diff --git a/lib/NintendoSDK b/lib/NintendoSDK
diff --git a/lib/sead b/lib/sead
diff --git a/src/Game/DLC/aocHardModeManager.cpp b/src/Game/DLC/aocHardModeManager.cpp
@@ -66,15 +66,15 @@ void HardModeManager::init_() {
 }
 
 void HardModeManager::nerfHpRestore(f32* hp) const {
-    *hp = sead::Mathf::max(*hp * getMultiplier(MultiplierType::HpRestore), 1.0f);
+    *hp = sead::Mathf::clampMin(*hp * getMultiplier(MultiplierType::HpRestore), 1.0f);
 }
 
 void HardModeManager::nerfHpRestore(s32* hp) const {
-    *hp = sead::Mathi::max(*hp * getMultiplier(MultiplierType::HpRestore), 1);
+    *hp = sead::Mathi::clampMin(*hp * getMultiplier(MultiplierType::HpRestore), 1);
 }
 
 void HardModeManager::modifyEnemyNoticeDuration(f32* value) const {
-    *value = sead::Mathf::max(*value * getMultiplier(MultiplierType::EnemyNoticeDuration), 0);
+    *value = sead::Mathf::clampMin(*value * getMultiplier(MultiplierType::EnemyNoticeDuration), 0);
 }
 
 bool HardModeManager::shouldCreateLifeRecoverInfo(ksys::act::Actor* actor) {

diff --git a/src/KingSystem/Physics/RigidBody/Shape/Box/physBoxShape.cpp b/src/KingSystem/Physics/RigidBody/Shape/Box/physBoxShape.cpp
@@ -11,9 +11,9 @@ BoxShape* BoxShape::make(const BoxShapeParam& param, sead::Heap* heap) {
     hkpBoxShape* box = nullptr;
     if (auto* storage = util::allocStorage<hkpBoxShape>(heap)) {
         const auto radius = param.convex_radius;
-        const hkVector4f half_extents{sead::Mathf::max(param.extents.x / 2 - radius, 0.001),
-                                      sead::Mathf::max(param.extents.y / 2 - radius, 0.001),
-                                      sead::Mathf::max(param.extents.z / 2 - radius, 0.001)};
+        const hkVector4f half_extents{sead::Mathf::clampMin(param.extents.x / 2 - radius, 0.001),
+                                      sead::Mathf::clampMin(param.extents.y / 2 - radius, 0.001),
+                                      sead::Mathf::clampMin(param.extents.z / 2 - radius, 0.001)};
         box = new (storage) hkpBoxShape(half_extents, radius);
     }
 
@@ -122,9 +122,10 @@ const hkpShape* BoxShape::updateHavokShape() {
     if (mFlags.isOn(Flag::Dirty)) {
         {
             const auto radius = mHavokShape->getRadius();
-            const sead::Vector3f half_extents{sead::Mathf::max(mExtents.x / 2 - radius, 0.001),
-                                              sead::Mathf::max(mExtents.y / 2 - radius, 0.001),
-                                              sead::Mathf::max(mExtents.z / 2 - radius, 0.001)};
+            const sead::Vector3f half_extents{
+                sead::Mathf::clampMin(mExtents.x / 2 - radius, 0.001),
+                sead::Mathf::clampMin(mExtents.y / 2 - radius, 0.001),
+                sead::Mathf::clampMin(mExtents.z / 2 - radius, 0.001)};
             const auto ref_count = mHavokShape->getReferenceCount();
             mHavokShape = new (mHavokShape) hkpBoxShape(toHkVec4(half_extents), radius);
             mHavokShape->setReferenceCount(ref_count);

diff --git a/src/KingSystem/Physics/RigidBody/physRigidBody.cpp b/src/KingSystem/Physics/RigidBody/physRigidBody.cpp
@@ -84,9 +84,9 @@ bool RigidBody::initMotionAccessorForDynamicMotion(sead::Heap* heap) {
 
     hkMatrix3 inertia;
     body->getInertiaLocal(inertia);
-    param.inertia = {sead::Mathf::max(inertia(0, 0), MinInertia),
-                     sead::Mathf::max(inertia(1, 1), MinInertia),
-                     sead::Mathf::max(inertia(2, 2), MinInertia)};
+    param.inertia = {sead::Mathf::clampMin(inertia(0, 0), MinInertia),
+                     sead::Mathf::clampMin(inertia(1, 1), MinInertia),
+                     sead::Mathf::clampMin(inertia(2, 2), MinInertia)};
     param.center_of_mass = toVec3(body->getCenterOfMassLocal());
     param.linear_damping = body->getLinearDamping();
     param.angular_damping = body->getAngularDamping();
@@ -126,9 +126,9 @@ bool RigidBody::createMotion(hkpMaxSizeMotion* motion, MotionType motion_type,
 
     case MotionType::Dynamic: {
         hkMatrix3f inertia_local;
-        inertia_local.m_col0.set(sead::Mathf::max(param.inertia.x, MinInertia), 0, 0);
-        inertia_local.m_col1.set(0, sead::Mathf::max(param.inertia.y, MinInertia), 0);
-        inertia_local.m_col2.set(0, 0, sead::Mathf::max(param.inertia.z, MinInertia));
+        inertia_local.m_col0.set(sead::Mathf::clampMin(param.inertia.x, MinInertia), 0, 0);
+        inertia_local.m_col1.set(0, sead::Mathf::clampMin(param.inertia.y, MinInertia), 0);
+        inertia_local.m_col2.set(0, 0, sead::Mathf::clampMin(param.inertia.z, MinInertia));
 
         hkpRigidBody::createDynamicRigidMotion(
             hkpMotion::MOTION_DYNAMIC, position, rotation, param.mass, inertia_local,
@@ -1630,7 +1630,7 @@ bool RigidBody::isEntityMotionFlag80On() const {
 void RigidBody::setColImpulseScale(float scale) {
     if (!isEntity())
         return;
-    scale = sead::Mathf::max(scale, 0.0);
+    scale = sead::Mathf::clampMin(scale, 0.0);
     getEntityMotionAccessor()->setColImpulseScale(scale);
 }
 

diff --git a/src/KingSystem/Physics/RigidBody/physRigidBodyMotionEntity.cpp b/src/KingSystem/Physics/RigidBody/physRigidBodyMotionEntity.cpp
@@ -300,14 +300,6 @@ float RigidBodyMotionEntity::getMassInv() const {
     return mMotion->getMassInv();
 }
 
-static inline float max3(float a, float b, float c) {
-    return sead::Mathf::max(c, a > b ? a : b);
-}
-
-static inline float min3(float a, float b, float c) {
-    return sead::Mathf::min(a < b ? a : b, c);
-}
-
 void RigidBodyMotionEntity::setInertiaLocal(const sead::Vector3f& inertia) {
     if (mBody->isCharacterControllerType())
         return;
@@ -317,8 +309,8 @@ void RigidBodyMotionEntity::setInertiaLocal(const sead::Vector3f& inertia) {
         return;
     }
 
-    const float max = max3(inertia.x, inertia.y, inertia.z);
-    const float min = min3(inertia.x, inertia.y, inertia.z);
+    const float max = sead::Mathf::max3(inertia.x, inertia.y, inertia.z);
+    const float min = sead::Mathf::min3(inertia.x, inertia.y, inertia.z);
     const float threshold = max * 0.8f;
 
     bool need_to_recreate_motion = false;

diff --git a/src/KingSystem/Physics/System/physContactMgr.cpp b/src/KingSystem/Physics/System/physContactMgr.cpp
@@ -551,19 +551,20 @@ void ContactMgr::setImpulseEntryContactInfo(RigidBody* body_a, RigidBody* body_b
     const auto relative_vel = linvel_a - linvel_b;
     const auto dot_neg = [&](const auto& vec) { return vec.dot(-contact_point_normal); };
 
-    float magnitude = is_flag_off ? sead::Mathf::max(0.0, relative_vel.dot(-contact_point_normal)) :
-                                    sead::Mathf::max(0.0, relative_vel.length());
+    float magnitude = is_flag_off ?
+                          sead::Mathf::clampMin(0.0, relative_vel.dot(-contact_point_normal)) :
+                          sead::Mathf::clampMin(0.0, relative_vel.length());
 
     if (magnitude >= entry->magnitude) {
         float i1, i2;
         if (is_flag_off) {
-            i1 = sead::Mathf::min(sead::Mathf::max(0.0, dot_neg(linvel_a)), magnitude);
-            i2 = sead::Mathf::min(sead::Mathf::max(0.0, linvel_b.dot(contact_point_normal)),
-                                  sead::Mathf::max(0.0, dot_neg(relative_vel)));
+            i1 = sead::Mathf::min(sead::Mathf::clampMin(0.0, dot_neg(linvel_a)), magnitude);
+            i2 = sead::Mathf::min(sead::Mathf::clampMin(0.0, linvel_b.dot(contact_point_normal)),
+                                  sead::Mathf::clampMin(0.0, dot_neg(relative_vel)));
         } else {
-            i1 = sead::Mathf::min(sead::Mathf::max(0.0, linvel_a.length()), magnitude);
-            i2 = sead::Mathf::min(sead::Mathf::max(0.0, linvel_b.length()),
-                                  sead::Mathf::max(0.0, relative_vel.length()));
+            i1 = sead::Mathf::min(sead::Mathf::clampMin(0.0, linvel_a.length()), magnitude);
+            i2 = sead::Mathf::min(sead::Mathf::clampMin(0.0, linvel_b.length()),
+                                  sead::Mathf::clampMin(0.0, relative_vel.length()));
         }
 
         entry->magnitude = magnitude;

diff --git a/src/KingSystem/System/VFR.cpp b/src/KingSystem/System/VFR.cpp
@@ -21,7 +21,7 @@ VFR::~VFR() {
 }
 
 void VFR::setDelta(u32 core, f32 delta) {
-    delta = sead::Mathf::max(delta, 0.01f);
+    delta = sead::Mathf::clampMin(delta, 0.01f);
     *mRawDeltaFrames[core] = delta;
     *mDeltaFrames[core] = delta * *mIntervalRatios[core];
     *mRawDeltaTimes[core] = delta * mFrameTime;
@@ -111,7 +111,7 @@ void VFR::TimeSpeedMultiplier::update(f32 multiplier) {
     if (target_value < value) {
         value = target_value;
     } else {
-        sead::Mathf::chase(&value, target_value, sead::Mathf::max(value * multiplier, 0.01));
+        sead::Mathf::chase(&value, target_value, sead::Mathf::clampMin(value * multiplier, 0.01));
     }
 }
 

diff --git a/src/KingSystem/World/worldManager.cpp b/src/KingSystem/World/worldManager.cpp
@@ -140,7 +140,7 @@ float Manager::calcTempDay(float height) const {
     float normal_temp = 23.0f;
 
     if (isMainField() && worldInfoLoaded()) {
-        height = sead::Mathf::max(height, 0.0f);
+        height = sead::Mathf::clampMin(height, 0.0f);
 
         int a = -1;
         float h{};
@@ -182,7 +182,7 @@ float Manager::calcTempNight(float height) const {
     float normal_temp = 23.0f;
 
     if (isMainField() && worldInfoLoaded()) {
-        height = sead::Mathf::max(height, 0.0f);
+        height = sead::Mathf::clampMin(height, 0.0f);
 
         int a = -1;
         float h{};

diff --git a/src/KingSystem/World/worldTimeMgr.cpp b/src/KingSystem/World/worldTimeMgr.cpp
@@ -327,7 +327,7 @@ void TimeMgr::calc_() {
         if (!mFindDungeonActivated && mTime >= 11_h)
             mTime = 11_h;
 
-        _d0 = sead::Mathf::max(mTimeStep / DefaultTimeStep, 1.0);
+        _d0 = sead::Mathf::clampMin(mTimeStep / DefaultTimeStep, 1.0);
         mBloodMoonTimer += delta;
         break;
     }
+8 −1		CMakeLists.txt
+62 −0		include/nn/am.h
+5 −0		include/nn/applet.h
+1 −1		include/nn/diag.h
+7 −140		include/nn/fs.h
+10 −0		include/nn/fs/fs_bcat.h
+59 −0		include/nn/fs/fs_directories.h
+111 −0		include/nn/fs/fs_files.h
+25 −0		include/nn/fs/fs_mount.h
+17 −0		include/nn/fs/fs_rom.h
+13 −0		include/nn/fs/fs_save.h
+82 −0		include/nn/fs/fs_types.h
+308 −29		include/nn/hid.h
+36 −9		include/nn/mem.h
+6 −0		include/nn/nnmusl.hpp
+6 −1		include/nn/oe.h
+3 −1		include/nn/os.h
+22 −0		include/nn/pl.h
+27 −0		include/nn/settings.h
+163 −16		include/nn/socket.h
+25 −2		include/nn/swkbd/swkbd.h
+220 −48		include/nn/util/util_BitFlagSet.h
+65 −0		include/nn/vfx/Resource.h
+1 −1		include/nvn/nvn_CppFuncPtrBase.h
+100 −0		include/nvn/nvn_DeviceConstantsNX.h
+7 −1		CMakeLists.txt
+4 −0		include/container/seadTList.h
+51 −0		include/devenv/seadFontMgr.h
+1 −1		include/filedevice/nin/seadNinFileDeviceBaseNin.h
+37 −3		include/framework/nx/seadGameFrameworkNx.h
+36 −0		include/framework/seadTask.h
+68 −0		include/gfx/nin/seadGraphicsNvn.h
+83 −0		include/gfx/nvn/seadDebugFontMgrNvn.h
+57 −9		include/gfx/seadCamera.h
+6 −10		include/gfx/seadDrawContext.h
+23 −0		include/gfx/seadDrawLockContext.h
+11 −1		include/gfx/seadGraphics.h
+1 −1		include/gfx/seadProjection.h
+4 −3		include/heap/seadHeapMgr.h
+1 −1		include/math/seadMathCalcCommon.hpp
+1 −0		include/math/seadQuatCalcCommon.h
+13 −2		include/math/seadQuatCalcCommon.hpp
+4 −0		include/math/seadVector.h
+27 −3		include/math/seadVector.hpp
+5 −0		include/math/seadVectorCalcCommon.h
+33 −9		include/math/seadVectorCalcCommon.hpp
+3 −0		include/math/seadVectorFwd.h
+17 −0		include/prim/seadSafeString.h
+2 −2		modules/src/controller/seadControllerBase.cpp
+2 −2		modules/src/controller/seadControllerWrapper.cpp
+6 −0		modules/src/devenv/seadFontMgr.cpp
+5 −2		modules/src/filedevice/nin/seadNinFileDeviceBaseNin.cpp
+2 −0		modules/src/filedevice/nin/seadNinSaveFileDeviceNin.cpp
+3 −1		modules/src/filedevice/seadFileDeviceMgr.cpp
+239 −0		modules/src/gfx/nvn/seadDebugFontMgrNvn.cpp
+20 −0		modules/src/gfx/seadDrawLockContext.cpp
+1 −1		modules/src/math/seadQuat.cpp