diff options
| author | Aetias <144526980+AetiasHax@users.noreply.github.com> | 2024-10-19 13:20:17 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-10-19 13:20:17 +0200 |
| commit | ffdfd609fb9bc8f968ddc6f187da1d50731cbf69 (patch) | |
| tree | d13b6142759bc78d50a491d87de56e7e9213c9a4 /include/lib/math.h | |
| parent | 32c4725191813003e34a263a6d1530f806d1ac7c (diff) | |
| parent | 10c2e3413b3244c5f2adffac1140f37920f13988 (diff) | |
Merge pull request #51 from AetiasHax/dsd
`dsd` integration
Diffstat (limited to 'include/lib/math.h')
| -rw-r--r-- | include/lib/math.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/include/lib/math.h b/include/lib/math.h index 8242284e..f11bd10e 100644 --- a/include/lib/math.h +++ b/include/lib/math.h @@ -8,10 +8,10 @@ typedef s32 q20; // Q4.12 fixed point number typedef s16 q4; -#define INT_TO_Q20(n) ((s32)((n) << 12)) -#define FLOAT_TO_Q20(n) ((s32)(((n) * 8192 + 1) / 2)) -#define ROUND_Q20(n) (((s32)(n) + 0x800) >> 12) -#define MUL_Q20(a,b) (q20)((((s64)(a)) * ((s64)(b)) + 0x800) >> 12) +#define INT_TO_Q20(n) ((s32) ((n) << 12)) +#define FLOAT_TO_Q20(n) ((s32) (((n) * 8192 + 1) / 2)) +#define ROUND_Q20(n) (((s32) (n) + 0x800) >> 12) +#define MUL_Q20(a, b) (q20)((((s64) (a)) * ((s64) (b)) + 0x800) >> 12) #define DEG_TO_ANG(n) ((n) * 0x10000 / 360) #define SIN(n) (gSinCosTable[2 * ((n) >> 4)]) @@ -60,6 +60,7 @@ inline void Vec3p_Rotate(Vec3p *vec, q20 sin, q20 cos, Vec3p *out) { inline void Vec3p_CopyXZ(Vec3p *vec, Vec3p *out) { q20 z = vec->z; q20 x = vec->x; + out->x = x; out->y = 0; out->z = z; |