Format code

DotKuribo · Aug 14, 2023 · 42b5f33 · 42b5f33
1 parent e4a7389
commit 42b5f33
Show file tree

Hide file tree

Showing 82 changed files with 591 additions and 569 deletions.
diff --git a/include/BetterSMS/application.hxx b/include/BetterSMS/application.hxx
@@ -12,5 +12,5 @@ namespace BetterSMS {
         bool registerContextCallback(u8 context, ContextCallback cb);
         void deregisterContextCallback(u8 context);
         void setIntroStage(u8 area, u8 episode);
-    }  // namespace Game
+    }  // namespace Application
 };     // namespace BetterSMS
diff --git a/include/BetterSMS/bmg.hxx b/include/BetterSMS/bmg.hxx
@@ -12,5 +12,5 @@ namespace BetterSMS {
 
         bool registerBMGCommandCallback(u8 identifier, BMGCommandCallback cb);
         void deregisterBMGCommandCallback(u8 identifier);
-    }
-};  // namespace BetterSMS::BMG
+    }  // namespace BMG
+};     // namespace BetterSMS
diff --git a/include/BetterSMS/game.hxx b/include/BetterSMS/game.hxx
@@ -23,5 +23,5 @@ namespace BetterSMS {
         void deregisterLoopCallback(const char *name);
         void deregisterPostDrawCallback(const char *name);
         void deregisterChangeCallback(const char *name);
-    }  // namespace Debug
+    }  // namespace Game
 };     // namespace BetterSMS
diff --git a/include/BetterSMS/libs/anim2d.hxx b/include/BetterSMS/libs/anim2d.hxx
@@ -3,9 +3,8 @@
 #include <Dolphin/OS.h>
 #include <Dolphin/types.h>
 
-#include <JSystem/JUtility/JUTTexture.hxx>
 #include <JSystem/J2D/J2DPicture.hxx>
-
+#include <JSystem/JUtility/JUTTexture.hxx>
 
 class SimpleTexAnimator {
 public:
@@ -16,8 +15,8 @@ public:
         : mTextures(textures), mTexCount(texCount), mRotation(0.0f), mSpin(0.0f), mLastTime(0),
           mCurrentFrame(0.0f), mFrameRate(30.0f) {}
     SimpleTexAnimator(const u8 **textures, size_t texCount)
-        : mTexCount(texCount), mRotation(0.0f), mSpin(0.0f), mLastTime(0),
-          mCurrentFrame(0.0f), mFrameRate(30.0f) {
+        : mTexCount(texCount), mRotation(0.0f), mSpin(0.0f), mLastTime(0), mCurrentFrame(0.0f),
+          mFrameRate(30.0f) {
         mTextures = reinterpret_cast<const ResTIMG **>(textures);
     }
     ~SimpleTexAnimator() {}

diff --git a/include/BetterSMS/libs/geometry.hxx b/include/BetterSMS/libs/geometry.hxx
@@ -130,7 +130,7 @@ namespace BetterSMS {
                 TVec3f euler;
 
                 // Assuming the order is Yaw-Pitch-Roll (Y-X-Z)
-                //if (rotMtx[0][2] > 0.998f) {  // singularity at north pole
+                // if (rotMtx[0][2] > 0.998f) {  // singularity at north pole
                 //    euler.x = atan2f(rotMtx[2][0], rotMtx[0][0]);
                 //    euler.y = M_PI / 2;
                 //    euler.z = 0;
@@ -145,15 +145,15 @@ namespace BetterSMS {
                 //}
 
                 //// Yaw (y rotation)
-                //float sinY = -rotMtx[2][0];
-                //float cosY = sqrtf(rotMtx[0][0] * rotMtx[0][0] + rotMtx[1][0] * rotMtx[1][0]);
-                //euler.y    = atan2f(sinY, cosY);
+                // float sinY = -rotMtx[2][0];
+                // float cosY = sqrtf(rotMtx[0][0] * rotMtx[0][0] + rotMtx[1][0] * rotMtx[1][0]);
+                // euler.y    = atan2f(sinY, cosY);
 
                 //// Pitch (x rotation)
-                //euler.x = atan2f(rotMtx[1][2], -rotMtx[2][2]);
+                // euler.x = atan2f(rotMtx[1][2], -rotMtx[2][2]);
 
                 //// Roll (z rotation)
-                //euler.z = atan2f(-rotMtx[1][0], -rotMtx[0][0]);
+                // euler.z = atan2f(-rotMtx[1][0], -rotMtx[0][0]);
 
                 const float PI_OVER_2 = 1.57079632679f;  // Pi/2
                 const float EPSILON   = 0.0001f;         // For precision checking

diff --git a/include/BetterSMS/libs/global_unordered_map.hxx b/include/BetterSMS/libs/global_unordered_map.hxx
@@ -5,6 +5,8 @@
 
 namespace BetterSMS {
     template <class _Key, class _T, class _Hash = JSystem::hash<_Key>,
-              class _Pred = JSystem::equal_to<_Key>> 
-    using TGlobalUnorderedMap = JGadget::TUnorderedMap<_Key, _T, _Hash, _Pred, TGlobalAllocator<JGadget::TPair<const _Key, _T>>>;
+              class _Pred = JSystem::equal_to<_Key>>
+    using TGlobalUnorderedMap =
+        JGadget::TUnorderedMap<_Key, _T, _Hash, _Pred,
+                               TGlobalAllocator<JGadget::TPair<const _Key, _T>>>;
 }
diff --git a/include/BetterSMS/libs/global_vector.hxx b/include/BetterSMS/libs/global_vector.hxx
@@ -4,6 +4,5 @@
 #include <JSystem/JGadget/Vector.hxx>
 
 namespace BetterSMS {
-    template <class _T> 
-    using TGlobalVector = JGadget::TVector<_T, TGlobalAllocator<_T>>;
+    template <class _T> using TGlobalVector = JGadget::TVector<_T, TGlobalAllocator<_T>>;
 }
diff --git a/include/BetterSMS/libs/profiler.hxx b/include/BetterSMS/libs/profiler.hxx
@@ -29,7 +29,7 @@ namespace BetterSMS {
         const char *mFunction;
         OSStopwatch mStopwatch;
     };
-}
+}  // namespace BetterSMS
 
 #define BETTERSMS_START_PROFILE BetterSMS::TProfiler __profiler = BetterSMS::TProfiler(SMS_FUNC_SIG)
 #define BETTERSMS_STOP_PROFILE  __profiler.~TProfiler()
diff --git a/include/BetterSMS/libs/string.hxx b/include/BetterSMS/libs/string.hxx
@@ -1,12 +1,12 @@
 #pragma once
 
 #include <Dolphin/OS.h>
-#include <Dolphin/types.h>
 #include <Dolphin/math.h>
+#include <Dolphin/types.h>
 
-#include <JSystem/bits/functional_hash.h>
-#include <JSystem/JGadget/Allocator.hxx>
 #include "global_allocator.hxx"
+#include <JSystem/JGadget/Allocator.hxx>
+#include <JSystem/bits/functional_hash.h>
 
 namespace BetterSMS {
 
@@ -183,7 +183,10 @@ namespace BetterSMS {
         }
 
         explicit _GLIBCXX20_CONSTEXPR TBasicString(const allocator_type &alloc) _GLIBCXX_NOEXCEPT
-            : mAllocator(alloc), mData(nullptr), mSize(0), mCapacity(120) {
+            : mAllocator(alloc),
+              mData(nullptr),
+              mSize(0),
+              mCapacity(120) {
             mData    = allocate_buffer(mCapacity);
             mData[0] = '\0';
         }
@@ -637,7 +640,7 @@ namespace BetterSMS {
                         "Realloc for TBasicString failed! (Attempted to allocate %lu bytes)", size);
             JSystem::copy(mData, mData + mSize + 1, p);
             deallocate_buffer(mData);
-            mData = p;
+            mData     = p;
             mCapacity = size;
         }
 
@@ -654,7 +657,7 @@ namespace BetterSMS {
     };
 
     template <class _CharT, class _Alloc = JGadget::TAllocator<_CharT>>
-    _GLIBCXX20_CONSTEXPR bool operator==(const TBasicString<_CharT, _Alloc>& a,
+    _GLIBCXX20_CONSTEXPR bool operator==(const TBasicString<_CharT, _Alloc> &a,
                                          const TBasicString<_CharT, _Alloc> &b) {
         if (a.length() != b.length())
             return false;
@@ -685,9 +688,9 @@ namespace BetterSMS {
     }
 #endif
 
-    using TString = TBasicString<char>;
+    using TString       = TBasicString<char>;
     using TGlobalString = TBasicString<char, TGlobalAllocator<char>>;
-    using TWString = TBasicString<wchar_t>;
+    using TWString      = TBasicString<wchar_t>;
 #ifdef _GLIBCXX_USE_CHAR8_T
     using TU8String = TBasicString<u8>;
 #endif
@@ -707,8 +710,7 @@ namespace JSystem {
 #ifndef _GLIBCXX_COMPATIBILITY_CXX0X
     /// std::hash specialization for string.
     template <typename _Alloc>
-    struct hash<BetterSMS::TBasicString<char, _Alloc>>
-        : public __str_hash_base<char, _Alloc> {};
+    struct hash<BetterSMS::TBasicString<char, _Alloc>> : public __str_hash_base<char, _Alloc> {};
 
     /// std::hash specialization for wstring.
     template <typename _Alloc>

diff --git a/include/BetterSMS/module.hxx b/include/BetterSMS/module.hxx
@@ -58,7 +58,7 @@
 #endif
 
 #define BETTER_SMS_FOR_CALLBACK SMS_NO_INLINE
-#define BETTER_SMS_FOR_EXPORT SMS_NO_INLINE
+#define BETTER_SMS_FOR_EXPORT   SMS_NO_INLINE
 
 namespace BetterSMS {
 
@@ -77,7 +77,8 @@ namespace BetterSMS {
 
     class BugsSetting final : public Settings::SwitchSetting {
     public:
-        BugsSetting(const char *name) : SwitchSetting(name, &mBugsValue), mBugsValue(true), mIsUnlocked(true) {}
+        BugsSetting(const char *name)
+            : SwitchSetting(name, &mBugsValue), mBugsValue(true), mIsUnlocked(true) {}
         ~BugsSetting() override {}
 
         bool isUnlocked() const override { return mIsUnlocked; }

diff --git a/include/BetterSMS/music.hxx b/include/BetterSMS/music.hxx
@@ -6,8 +6,8 @@
 #include <Dolphin/types.h>
 #include <JSystem/JKernel/JKRHeap.hxx>
 #include <JSystem/JSupport/JSUStream.hxx>
-#include <SMS/System/Params.hxx>
 #include <SMS/MSound/MSBGM.hxx>
+#include <SMS/System/Params.hxx>
 
 namespace BetterSMS {
     namespace Music {
@@ -202,4 +202,4 @@ namespace BetterSMS {
         bool isWeakBGM(u32 id);
         bool isWeakBGM(MSStageInfo id);
     }  // namespace Music
-}  // namespace BetterSMS::Music
+}  // namespace BetterSMS
diff --git a/include/BetterSMS/object.hxx b/include/BetterSMS/object.hxx
@@ -24,4 +24,4 @@ namespace BetterSMS {
 
         bool deregisterObject(const char *name);
     }  // namespace Objects
-}  // namespace BetterSMS::Objects
+}  // namespace BetterSMS
diff --git a/include/BetterSMS/objects/particle.hxx b/include/BetterSMS/objects/particle.hxx
@@ -17,7 +17,8 @@ public:
     }
 
     TParticleBox(const char *name)
-        : TActor(name), mID(-1), mSpawnRate(10), mSpawnScale(1.0f), mShape(BoundingType::Box), mIsStrict(false), mSpawnTimer() {}
+        : TActor(name), mID(-1), mSpawnRate(10), mSpawnScale(1.0f), mShape(BoundingType::Box),
+          mIsStrict(false), mSpawnTimer() {}
     virtual ~TParticleBox() override {}
 
     void load(JSUMemoryInputStream &in) override;

diff --git a/include/BetterSMS/objects/sound.hxx b/include/BetterSMS/objects/sound.hxx
@@ -17,8 +17,8 @@ public:
     }
 
     TSoundBox(const char *name)
-        : TActor(name), mID(-1), mVolume(1.0f), mPitch(1.0f), mSpawnRate(1), mShape(BoundingType::Box),
-          mSpawnTimer(), mSoundPos() {}
+        : TActor(name), mID(-1), mVolume(1.0f), mPitch(1.0f), mSpawnRate(1),
+          mShape(BoundingType::Box), mSpawnTimer(), mSoundPos() {}
     virtual ~TSoundBox() override {}
 
     void load(JSUMemoryInputStream &in) override;

diff --git a/include/BetterSMS/player.hxx b/include/BetterSMS/player.hxx
@@ -7,8 +7,8 @@
 #include <JSystem/JGeometry/JGMVec.hxx>
 #include <JSystem/JSupport/JSUMemoryStream.hxx>
 #include <JSystem/JUtility/JUTColor.hxx>
-#include <SMS/Player/Mario.hxx>
 #include <SMS/Camera/PolarSubCamera.hxx>
+#include <SMS/Player/Mario.hxx>
 #include <SMS/raw_fn.hxx>
 
 #include "libs/container.hxx"
@@ -22,7 +22,7 @@ using namespace BetterSMS::Collision;
 namespace BetterSMS {
     namespace Player {
         struct TPlayerData;
-        
+
         // Get the specialized BetterSMS info of a player
         void *getRegisteredData(TMario *, const char *);
 
@@ -79,13 +79,10 @@ namespace BetterSMS {
 
         struct TPlayerParams : public TParams {
             TPlayerParams()
-                : TParams(), SMS_TPARAM_INIT(mMaxHealth, 8),
-                  SMS_TPARAM_INIT(mCanRideYoshi, true),
-                  SMS_TPARAM_INIT(mCanUseFludd, true),
-                  SMS_TPARAM_INIT(mPlayerHasHelmet, false),
+                : TParams(), SMS_TPARAM_INIT(mMaxHealth, 8), SMS_TPARAM_INIT(mCanRideYoshi, true),
+                  SMS_TPARAM_INIT(mCanUseFludd, true), SMS_TPARAM_INIT(mPlayerHasHelmet, false),
                   SMS_TPARAM_INIT(mPlayerHasGlasses, false),
-                  SMS_TPARAM_INIT(mPlayerHasShirt, false),
-                  SMS_TPARAM_INIT(mScaleMultiplier, 1.0f),
+                  SMS_TPARAM_INIT(mPlayerHasShirt, false), SMS_TPARAM_INIT(mScaleMultiplier, 1.0f),
                   SMS_TPARAM_INIT(mThrowPowerMultiplier, 1.0f),
                   SMS_TPARAM_INIT(mUnderwaterHealthMultiplier, 1.0f),
                   SMS_TPARAM_INIT(mFallDamageMinMultiplier, 1.0f) {

diff --git a/include/BetterSMS/stage.hxx b/include/BetterSMS/stage.hxx
@@ -2,9 +2,9 @@
 
 #include <JSystem/J2D/J2DOrthoGraph.hxx>
 #include <JSystem/JDrama/JDRNameRef.hxx>
+#include <SMS/MapObj/MapObjInit.hxx>
 #include <SMS/System/Application.hxx>
 #include <SMS/System/MarDirector.hxx>
-#include <SMS/MapObj/MapObjInit.hxx>
 #include <SMS/System/Params.hxx>
 
 namespace BetterSMS {
@@ -64,8 +64,7 @@ namespace BetterSMS {
 
             static TStageParams *sStageConfig;
 
-            static char *stageNameToParamPath(char *dst, const char *stage,
-                                              bool global = false);
+            static char *stageNameToParamPath(char *dst, const char *stage, bool global = false);
 
             bool isCustomConfig() const { return mIsCustomConfigLoaded; }
             void load(const char *stageName);

diff --git a/include/BetterSMS/sunscript.hxx b/include/BetterSMS/sunscript.hxx
@@ -1,9 +1,9 @@
 #pragma once
 
 #include <Dolphin/types.h>
-#include <SMS/assert.h>
 #include <SMS/SPC/SpcInterp.hxx>
 #include <SMS/SPC/SpcSlice.hxx>
+#include <SMS/assert.h>
 
 #include "sunscript.hxx"
 

diff --git a/include/BetterSMS/time.hxx b/include/BetterSMS/time.hxx
@@ -11,4 +11,4 @@ namespace BetterSMS {
         void calendarToDate(char *dst, const OSCalendarTime &calendar);
         void calendarToTime(char *dst, const OSCalendarTime &calendar);
     }  // namespace Time
-}  // namespace BetterSMS::Time
+}  // namespace BetterSMS
diff --git a/lib/sms_interface b/lib/sms_interface