diff options
| author | robojumper <robojumper@gmail.com> | 2026-05-31 18:08:09 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-05-31 18:08:09 +0200 |
| commit | 560ff1832045cda4247db542c8dacfd2e614d9dc (patch) | |
| tree | a18c851ac393218e8b88f7cd90c3fdd5574ba063 /include/JSystem | |
| parent | 31423c25ae448ddf8c4c6c8577bd76530eb33e02 (diff) | |
| parent | 9b4820921c10c7157b9f21fbf0da0acc93075bcb (diff) | |
Merge pull request #325 from robojumper/reimport-msl-c
Re-import MSL_C from TP
Diffstat (limited to 'include/JSystem')
| -rw-r--r-- | include/JSystem/JGeometry.h | 3 | ||||
| -rw-r--r-- | include/JSystem/JMath/JMath.h | 2 | ||||
| -rw-r--r-- | include/JSystem/JParticle/JPAEmitter.h | 2 |
3 files changed, 5 insertions, 2 deletions
diff --git a/include/JSystem/JGeometry.h b/include/JSystem/JGeometry.h index 8a298132..cfe10968 100644 --- a/include/JSystem/JGeometry.h +++ b/include/JSystem/JGeometry.h @@ -2,9 +2,10 @@ #define JGEOMETRY_H #include "common.h" -#include "math.h" #include "JSystem/JMath/JMath.h" +#include <cmath> + // TODO - a lot of this has been moved to nw4r and egg. Kept for reference for now. namespace JGeometry { diff --git a/include/JSystem/JMath/JMath.h b/include/JSystem/JMath/JMath.h index 343571b8..5a86c82c 100644 --- a/include/JSystem/JMath/JMath.h +++ b/include/JSystem/JMath/JMath.h @@ -3,7 +3,7 @@ #include "common.h" #include "rvl/MTX.h" -#include "math.h" +#include <cmath> void JMAMTXApplyScale(const Mtx, Mtx, f32, f32, f32); void JMAEulerToQuat(s16 param_0, s16 param_1, s16 param_2, Quaternion* param_3); diff --git a/include/JSystem/JParticle/JPAEmitter.h b/include/JSystem/JParticle/JPAEmitter.h index 807c2d96..ecf1e9f5 100644 --- a/include/JSystem/JParticle/JPAEmitter.h +++ b/include/JSystem/JParticle/JPAEmitter.h @@ -12,6 +12,8 @@ #include "egg/math/eggVector.h" #include "m/m_angle.h" +#include <cstdint> + class JPAResourceManager; class JPABaseEmitter; class JPAEmitterManager; |