mirror of
https://github.com/zeldaret/oot.git
synced 2024-11-29 12:04:29 +00:00
321388673b
* cleanup * name camera action functions * decompile a few small functions, name a few Camera struct members * decompile camera data, decompile a few camera functions * Split ASM for code_800BB0A0 * removing code_800BB0A0.s * PR Requests, Camera WIP * remove #define NON_MATCHING from db_camera * rename code_8007BF90.c to z_olib.c, rename functions in z_olib.c * camera wip * rename some struct memebers, some decomp wip * pr updates * camera wip * name some fields in Camera Struct, being making sense of Camera_Update * Camera WIP * wip * wip * add z64camera.h header, begin creating CameraSetting macros * wip * wip * wip * wip * migrate camera bss to c * match a couple functions in db_camera * match some small db_camera functions * wip * migrate db_camera rodata, match a few functions * remote db_camera.rodata.s * match some of db_camera * identify types of some unknown data pieces * some small wip * Match Camera_Init, some function changes, some struct name changes. Change unk_C0 and unk_CC to floats from Vec3fs * add naming for a few more Camera struct members * wip * match func_80043F94 * Match Camera_Jump1 * document some of Camera_Jump1 * wip * match Camera_Jump3 * Match Camera_Update, FeelsAmazing * wip * wip * match Camera_SetParam * minor cleanup * wip * wip * match Camera_KeepOn0 * some documentation, modify some matching functions to match style of others. * match Camera_Demo1 * match camera_demo9 * document Camera_Demo1 and Camera_Demo9 * wip * Match camera_battle4 * match camera_unique2 * Match Camera_Unique3 * match camera_special6 * match Camera_Special5 * wip * document camera_special6 * naming updates * match camera_Unique1 * match Camera_Unique0 * wip * Match Camera_CalcUpFromPitchYawRoll * match func_80045508 * document Camera_Battle4 * document several camera functions, move camera data to separate file * rename phi/theta to pitch/yaw * wip * uniq9 wip * Camera_Unqiue9 OK * document Camera_Unique9 * name unk_160 in camera struct * wip * wip * minor updates * fix conflicts * wip * wip * Olib updates * wip * wip * rename most Math3D functions, few matches, documentation * wip * document most of math3d * wip * wip * wip * pr updates * Match Camera_Fixed4 * match func_80058E8C * pr updates * add missing comment block finalizer * Merge math3dupdates * match Camera_ChangeSetting * Match Camera_ChangeMode * match func_80058148 * Match Camera_Special9 * decompile the rest of camera data * match Camera_Demo5 * name a few camera functions in z_play * match func_80046CB4, some work on other fucntions * wip * impove some non matchings * fix function rename * match func_800588B4 * match Camera_Subj4 * wip * Camera_Demo3 matching, Camera_Battle1 big progress * Camera_Normal2 OK * wip * match Camera_Parallel1 * normalize some things across functions * match Camera_Normal1 * Match Camera_Normal3 * some cleanup * more cleanup * more cleanup , match Camera_CalcDefaultPitch * data formatting * Match Camera_Jump2 * document Camera_Jump2 * Match Camera_KeepOn3 * document some of Camera_KeepOn3 * improve some non_matchings * match func_80045C74 and func_800460A8 * code cleanup, documentation * match Camera_KeepOn1 * Match Camera_Subj3 * Match Camera_Battle1 * remove non_matching from func_80044adc and func_80046e20 * name several members of Battle1 * more documentation on Battle1 * cleanup * renaming Camera_Vec3fScaleXYZFactor to Camera_Vec3fTranslateByUnitVector * reorganize update structs, remove final references to params, remove CameraParams union * implement camera enums into player * Renaming Camera_GetDir to Camera_GetInputDir, Camera_GetRealDir to Camera_GetCamDir, etc, implement camera enum's into player * remove non-global camera variables from variables.h * clean up some variable declarations * finish pr comment updates * fix some warnings * data formatting * finish commenting on data * delete unused asm * remove asm Co-authored-by: fig <fig02srl@gmail.com>
106 lines
2.5 KiB
C
106 lines
2.5 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)
|
|
#define COLPOLY_NORM_FRAC (1.0f / 32767)
|
|
#define BGCHECK_Y_MIN -32000.0f
|
|
|
|
/**
|
|
* Trig macros
|
|
*/
|
|
#define DEGF_TO_BINANG(degreesf) (s16)(degreesf * 182.04167f + 0.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))
|
|
|
|
#endif
|