Merge pull request #161 from lepelog/c-lib

c_lib OK
This commit is contained in:
TakaRikka
2021-12-02 06:38:58 -08:00
committed by GitHub
29 changed files with 267 additions and 1663 deletions
+5
View File
@@ -4,6 +4,11 @@
#include "SSystem/SComponent/c_xyz.h"
#include "dolphin/mtx/mtx.h"
#include "dolphin/types.h"
#include "msl_c/math.h"
inline bool cLib_IsZero(f32 f) {
return fabsf(f) < 8e-11f;
}
void cLib_memCpy(void* dst, const void* src, unsigned long size);
void cLib_memSet(void* ptr, int value, unsigned long size);
+7
View File
@@ -3,6 +3,7 @@
#include "dolphin/mtx/vec.h"
#include "global.h"
#include "msl_c/math.h"
struct cXyz : Vec {
static const cXyz Zero;
@@ -50,11 +51,13 @@ struct cXyz : Vec {
y -= f;
z -= f;
}
void operator-=(const Vec& other) { PSVECSubtract(this, &other, this); }
void operator+=(const Vec& vec) {
x += vec.x;
y += vec.y;
z += vec.z;
}
void operator*=(f32 scale) { PSVECScale(this, this, scale); }
/* 80266C6C */ cXyz getCrossProduct(Vec const&) const;
/* 80266CBC */ cXyz outprod(Vec const&) const;
/* 80266CE4 */ cXyz norm() const;
@@ -116,6 +119,10 @@ struct cXyz : Vec {
cXyz tmp2(other.x, 0, other.z);
return tmp.abs2(tmp2);
}
f32 abs() const { return sqrtf(this->abs2()); }
f32 abs(const Vec& other) const { return sqrtf(this->abs2(other)); }
f32 absXZ() const { return sqrtf(this->abs2XZ()); }
f32 absXZ(const Vec& other) const { return sqrtf(this->abs2XZ(other)); }
f32 getMagXZ() const { return cXyz(this->x, 0, this->z).getSquareMag(); }
};
+2 -1
View File
@@ -46,6 +46,7 @@ f32 tanf(f32);
extern f32 __float_nan[4];
extern f32 __float_epsilon[4];
extern f32 __float_max[4];
inline f64 sqrt_step(f64 tmpd, f32 mag) {
return tmpd * 0.5 * (3.0 - mag * (tmpd * tmpd));
@@ -68,4 +69,4 @@ inline f32 sqrtf(f32 mag) {
}
}
#endif
#endif