mirror of
https://github.com/zeldaret/oot.git
synced 2024-11-25 17:54:15 +00:00
3cef03f5ff
* beginning of migrating changes * got matching * changed order a bit * clean up bgcheck * fix conflict * fix conflict again * first stab at identifying types, some oks * Clean up most bad structs/pointer math, move relevant structs to z64bgcheck.h, get some OKs * more OKs, z_bgcheck.bss migration, update some sys_math3d.c args * couple more OKs * pushing some OKs * fix compilation issues * code_800430A0.c OK, more files decomp'd * 8003A3E0 big OK :) * Decomp most of func_8003C614, decomp helper funcs * Decomp SurfaceType, CamData, and WaterBox property related functions * more OKs, big OK in 8003C078 * more OKs, more progress, move a function definition in z_collision_check to functions.h * more clean-ups, more OKs, dyn_vtx is now defined as u8* * 8003A5B8, 8003A7D8, 8003C614, 8003DD6C OK, document function args better * data migrated, more OKs * 80041240 OK, func_8003B3C8 and func_8003BB18 disassembled * func_80040284, 800409A8 non_matching, add IS_ZERO macro * All asm files have C representations, some big OKs, lots of minor tweaks * More OKs, non-matching code cleanup * 8003FBF4 and 80040BE4 OK, improve codegen for most functions * format z_bgcheck.c * fix warnings, compile errors on NON_MATCHING * func_8003EE80 is now NON_MATCHING * begin documenting some functions * formatting * more documentation, func_8003A95C OK * fix PHYSICAL_TO_VIRTUAL changes * fix var rename * More documentation, functions 80040E40, 80041648 OK, change types to not be compatible with ZAP * func_8004239C ok, more NON_MATCHING improvements, more documentation * Implement most suggested changes * Convert comments to slower comments * /** * Implement ZAP2 changes * my anti-virus ate my format.sh results * Rename a couple hundred functions, fix minor stuff * rename var so that clang formats correctly * run format.sh * implement Petrie's matches/suggestions * format * matches * and the asm * slight error * Add SSList * two more matches * stuff * implement code changes * clean up Petrie's matchings Co-authored-by: Arthur <arthurtilly413@gmail.com> Co-authored-by: fig02 <fig02srl@gmail.com> Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain>
109 lines
2.8 KiB
C
109 lines
2.8 KiB
C
#ifndef _Z64MATH_H_
|
|
#define _Z64MATH_H_
|
|
|
|
#include "ultra64.h"
|
|
|
|
#define VEC_SET(V,X,Y,Z) V.x=X;V.y=Y;V.z=Z
|
|
|
|
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 F32_LERP(v0,v1,t) ((1.0f - (t)) * (v0) + (t) * (v1))
|
|
#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_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
|