mirror of
https://github.com/HarbourMasters/Shipwright.git
synced 2024-11-27 03:42:19 -05:00
778f548b01
* Refactor `Vec2f`, `Vec3f`, `Vec3s` in `z64math` to avoid reserved identifiers. * Include `z64save` in SaveManager, which requires encapsulating `#include gameplaystats.h` and `InitStatTracker` in the cpp to fix compile issues. Adds SaveContext reference parameters to SaveFunc and existing implementations in preparation for threaded saves. * Threaded saves fully implemented. Platform-specific save code removed. Thread safety added. Will wait for thread pool tasks to finish before resetting or closing. * Converted gSaveContext copy for save threads to the heap with `new`, deleted at the end of the threaded function to prevent possible issues with the stack. * Turns out leaving the call to `ThreadPoolWait` in a `GameInteractor::OnExitGame` hook seems to be just fine. * Removed unnecessary references to `SaveManager::ThreadPoolWait()`, game hooks are the only places it's called now. * Re-added WiiU/Switch performance save code. * Added call to `SaveManager::ThreadPoolWait` in `Sram_InitSave` to prevent trying to load a newly "created" save before the save file was actually written. --------- Co-authored-by: Christopher Leggett <chris@leggett.dev>
121 lines
3.2 KiB
C
121 lines
3.2 KiB
C
#ifndef Z64MATH_H
|
|
#define Z64MATH_H
|
|
|
|
#include <libultraship/libultra.h>
|
|
#include <include/libc/math.h>
|
|
|
|
#define VEC_SET(V,X,Y,Z) (V).x=(X);(V).y=(Y);(V).z=(Z)
|
|
|
|
#ifdef __cplusplus
|
|
#define Vec2f Vec2f_
|
|
#define Vec3f Vec3f_
|
|
#define Vec3s Vec3s_
|
|
#endif
|
|
|
|
typedef struct {
|
|
f32 x, y;
|
|
} Vec2f; // size = 0x08
|
|
|
|
typedef struct {
|
|
f32 x, y, z;
|
|
} Vec3f; // size = 0x0C
|
|
|
|
typedef struct {
|
|
u16 x, y, z;
|
|
} Vec3us; // size = 0x06
|
|
|
|
typedef struct {
|
|
s16 x, y, z;
|
|
} Vec3s; // size = 0x06
|
|
|
|
typedef struct {
|
|
s32 x, y, z;
|
|
} Vec3i; // size = 0x0C
|
|
|
|
typedef struct {
|
|
Vec3s center;
|
|
s16 radius;
|
|
} Sphere16; // size = 0x08
|
|
|
|
typedef struct {
|
|
Vec3f center;
|
|
f32 radius;
|
|
} Spheref; // size = 0x10
|
|
|
|
typedef struct {
|
|
Vec3f normal;
|
|
f32 originDist;
|
|
} Plane; // size = 0x10
|
|
|
|
typedef struct {
|
|
Vec3f vtx[3];
|
|
Plane plane;
|
|
} TriNorm; // size = 0x34
|
|
|
|
typedef struct {
|
|
/* 0x0000 */ s16 radius;
|
|
/* 0x0002 */ s16 height;
|
|
/* 0x0004 */ s16 yShift;
|
|
/* 0x0006 */ Vec3s pos;
|
|
} Cylinder16; // size = 0x0C
|
|
|
|
typedef struct {
|
|
/* 0x00 */ f32 radius;
|
|
/* 0x04 */ f32 height;
|
|
/* 0x08 */ f32 yShift;
|
|
/* 0x0C */ Vec3f pos;
|
|
} Cylinderf; // size = 0x18
|
|
|
|
typedef struct {
|
|
/* 0x0000 */ Vec3f point;
|
|
/* 0x000C */ Vec3f dir;
|
|
} InfiniteLine; // size = 0x18
|
|
|
|
typedef struct {
|
|
/* 0x0000 */ Vec3f a;
|
|
/* 0x000C */ Vec3f b;
|
|
} Linef; // size = 0x18
|
|
|
|
// Defines a point in the spherical coordinate system
|
|
typedef struct {
|
|
/* 0x00 */ f32 r; // radius
|
|
/* 0x04 */ s16 pitch; // polar (zenith) angle
|
|
/* 0x06 */ s16 yaw; // azimuthal angle
|
|
} VecSph; // size = 0x08
|
|
|
|
#define LERP(x, y, scale) (((y) - (x)) * (scale) + (x))
|
|
#define LERP32(x, y, scale) ((s32)(((y) - (x)) * (scale)) + (x))
|
|
#define LERP16(x, y, scale) ((s16)(((y) - (x)) * (scale)) + (x))
|
|
#define F32_LERP(v0,v1,t) ((v0) * (1.0f - (t)) + (v1) * (t))
|
|
#define F32_LERPIMP(v0, v1, t) (v0 + ((v1 - v0) * t))
|
|
#define F32_LERPIMPINV(v0, v1, t) ((v0) + (((v1) - (v0)) / (t)))
|
|
#define BINANG_LERPIMP(v0, v1, t) ((v0) + (s16)(BINANG_SUB((v1), (v0)) * (t)))
|
|
#define BINANG_LERPIMPINV(v0, v1, t) ((v0) + BINANG_SUB((v1), (v0)) / (t))
|
|
|
|
#define VEC3F_LERPIMPDST(dst, v0, v1, t){ \
|
|
(dst)->x = (v0)->x + (((v1)->x - (v0)->x) * t); \
|
|
(dst)->y = (v0)->y + (((v1)->y - (v0)->y) * t); \
|
|
(dst)->z = (v0)->z + (((v1)->z - (v0)->z) * t); \
|
|
}
|
|
|
|
#define IS_ZERO(f) (fabsf(f) < 0.008f)
|
|
|
|
// Trig macros
|
|
#define DEGF_TO_BINANG(degreesf) (s16)(degreesf * 182.04167f + .5f)
|
|
#define RADF_TO_BINANG(radf) (s16)(radf * (32768.0f / M_PI))
|
|
#define RADF_TO_DEGF(radf) (radf * (180.0f / M_PI))
|
|
#define DEGF_TO_RADF(degf) (degf * (M_PI / 180.0f))
|
|
#define BINANG_ROT180(angle) ((s16)(angle - 0x7FFF))
|
|
#define BINANG_SUB(a, b) ((s16)(a - b))
|
|
#define DEG_TO_RAD(degrees) ((degrees) * (M_PI / 180.0f))
|
|
#define BINANG_TO_DEGF(binang) ((f32)binang * (360.0001525f / 65535.0f))
|
|
#define BINANG_TO_RAD(binang) (((f32)binang / 32768.0f) * M_PI)
|
|
|
|
// Vector macros
|
|
#define SQXZ(vec) ((vec.x) * (vec.x) + (vec.z) * (vec.z))
|
|
#define DOTXZ(vec1, vec2) ((vec1.x) * (vec2.x) + (vec1.z) * (vec2.z))
|
|
#define SQXYZ(vec) ((vec.x) * (vec.x) + (vec.y) * (vec.y) + (vec.z) * (vec.z))
|
|
#define DOTXYZ(vec1, vec2) ((vec1.x) * (vec2.x) + (vec1.y) * (vec2.y) + (vec1.z) * (vec2.z))
|
|
|
|
#endif
|