2025-06-04 14:38:33 -04:00
|
|
|
#ifndef Z_MATH_H
|
|
|
|
|
#define Z_MATH_H
|
|
|
|
|
|
|
|
|
|
// This file has a z_ prefix to indicate that it is the game-side math header, not libc
|
2020-04-18 22:28:24 -05:00
|
|
|
|
Merge decomp/main (#141)
* Match retail BSS ordering (#1927)
* Match retail BSS ordering
* Revert moving some global variables to headers
* Adjust block numbers after header changes
* Fix debug build
* Overlay bss ordering
* Fix BSS ordering after header changes
* gc-eu-mq OK
* Implement preprocessor for #pragma increment_block_number
* Transfer usage comment from reencode.sh
* Use temporary directory instead of temporary file
* Move ColChkMassType back
* Player: Document "WaitForPutAway" (#1936)
* document put away delay
* functions.txt
* add a note on delaying indefinitely
* format
* typo
* delay -> wait for put away
* revert unintended formatting change
* add comment to struct member
* format
* fix functions.txt
* Set up gc-eu and match all code (#1938)
* Set up gc-eu and match all code
* Format
* Mark gc-eu-mq as WIP until it builds OK
* Move original/MQ map mark data to separate files
* Add #includes to .inc.c files to help out VS Code
* Use #if in spec instead of .inc.c files
* Delete disassembly data for gc-eu-mq (#1942)
* Player Docs: "sUpperBodyIsBusy" (#1944)
* document upperbodybusy
* change wording for comment and rename upperanimblendweight
* format
* review
* Fix miscategorized scenes (#1946)
* Fix miscategorized scenes
* Sort includes
* Player Docs: Action Interrupt (#1947)
* document action interrupt
* format
* new function comment
* format
* add a note about items
* format
* Add gc-eu-mq to CI (#1943)
* Add gc-eu-mq to CI
* Give up on scripting
* Revert quotes changes
* Player Docs: Name some high level update calls (#1593)
* name some low hanging fruit
* revert burn and shock, doing in seperate pr
* add some function comments
* yaw func
* adjust comment
* some review
* unname UpdateZTarget
* Player_DetectRumbleSecrets
* fix dive do action name
* Player Docs: Control stick buffers (#1945)
* name vars and add enum
* name some spin attack stuff
* fix right and left
* forward/backward
* format
* fix retail bss
* sControlStickWorldYaw
* Force string.o to be in boot for gcc builds (#1948)
In retail builds, memcpy is linked in code, not boot, but GCC likes to call memcpy when copying structs so currently GCC builds immediately crash in __osInitialize_common.
* Rename yDistToWater -> depthInWater (#1950)
* Rename yDistToWater -> yDistUnderWater
* yDistUnderWater -> depthInWater
* Check baserom hash before decompression (#1952)
* Remove Cygwin support (#1951)
* Document pause page switching (#1550)
* Document pause page switching
* document initial scroll left setup, when opening the pause menu
* `PAUSE_MAIN_STATE_1` -> `PAUSE_MAIN_STATE_SWITCHING_PAGE`
* try a diagram of the pages layout in world space as a comment
* expand `nextPageMode` comment
* touch up pause camera header comments
* expand comment on irrelevant init `mainState = PAUSE_MAIN_STATE_SWITCHING_PAGE`
* expand doc on `sKaleidoSetup*` data
* expand docs on `gPageSwitchNextButtonStatus`
* add some doc on `sPageSwitch*` arrays
* SwitchPage -> PageSwitch
* add `PAGE_SWITCH_NSTEPS`
* `SWITCH_PAGE_*_PT` -> `PAGE_SWITCH_PT_*`
* peepoArtist
---------
Co-authored-by: fig02 <fig02srl@gmail.com>
* Fix LensMode Enum Names (#1954)
* Change linker script so gGameOverTimer can be in z_game_over.c (#1939)
* Change linker script so gGameOverTimer can be in z_game_over.c
* gGameOverTimer -> sGameOverTimer
* include_data_only_with_rodata -> include_data_only_within_rodata
* fix build issues
* Check buffers segment in check_ordering.py (#1960)
* Delete unused yaz0tool (#1959)
* Revamp "AnimationContext" Docs, now called "AnimTaskQueue" (#1941)
* start using task terminology
* more docs
* format
* cleanups
* MoveActor -> ActorMove
* missed a couple
* hopefully the last changes
* comment explaining the group change
* some review
* dragorn review
* remove accidental file
* fix matching issue, now use while loop
* Experiment: remove global.h dependency from sys_math, sys_math3d, z_lib (#1956)
* split sys_math, sys_math3d, z_lib from global.h
* suggestions
* forgot this
* more math stuff
* nit fix
* re-add ichain.h
* resolve tharo's comments
* Fix check_ordering.py checking for shifted/nonmatching-besides-relocs (#1961)
* Run CC_CHECK with the correct CPP defines (#1963)
* Run CC_CHECK with the correct CPP defines
* Add "CPP_DEFINES ?="
---------
Co-authored-by: cadmic <cadmic24@gmail.com>
Co-authored-by: fig02 <fig02srl@gmail.com>
Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
Co-authored-by: inspectredc <78732756+inspectredc@users.noreply.github.com>
Co-authored-by: mzxrules <mzxrules@gmail.com>
2024-06-22 22:36:26 +02:00
|
|
|
#include "math.h"
|
2025-04-25 21:12:35 -04:00
|
|
|
#include "ultra64.h"
|
2020-04-18 22:28:24 -05:00
|
|
|
|
2024-09-06 05:46:44 -07:00
|
|
|
typedef union FloatInt {
|
|
|
|
|
f32 f;
|
|
|
|
|
u32 i;
|
|
|
|
|
} FloatInt;
|
|
|
|
|
|
2024-08-14 15:55:05 +02:00
|
|
|
typedef struct Vec2s {
|
2024-05-08 12:04:46 +02:00
|
|
|
s32 x, y;
|
|
|
|
|
} Vec2s; // size = 0x08
|
|
|
|
|
|
2024-08-12 00:07:48 -07:00
|
|
|
typedef struct Vec2f {
|
2020-04-18 22:28:24 -05:00
|
|
|
f32 x, y;
|
2020-07-30 15:50:18 -04:00
|
|
|
} Vec2f; // size = 0x08
|
2020-04-18 22:28:24 -05:00
|
|
|
|
2024-08-12 00:07:48 -07:00
|
|
|
typedef struct Vec3f {
|
2020-04-18 22:28:24 -05:00
|
|
|
f32 x, y, z;
|
2020-07-30 15:50:18 -04:00
|
|
|
} Vec3f; // size = 0x0C
|
2020-04-18 22:28:24 -05:00
|
|
|
|
2024-08-12 00:07:48 -07:00
|
|
|
typedef struct Vec3us {
|
2020-07-20 15:06:04 -07:00
|
|
|
u16 x, y, z;
|
2020-07-30 15:50:18 -04:00
|
|
|
} Vec3us; // size = 0x06
|
2020-07-20 15:06:04 -07:00
|
|
|
|
2024-08-12 00:07:48 -07:00
|
|
|
typedef struct Vec3s {
|
2020-04-18 22:28:24 -05:00
|
|
|
s16 x, y, z;
|
2020-07-30 15:50:18 -04:00
|
|
|
} Vec3s; // size = 0x06
|
2020-04-18 22:28:24 -05:00
|
|
|
|
2024-08-12 00:07:48 -07:00
|
|
|
typedef struct Vec3i {
|
2020-04-18 22:28:24 -05:00
|
|
|
s32 x, y, z;
|
2020-07-30 15:50:18 -04:00
|
|
|
} Vec3i; // size = 0x0C
|
2020-04-18 22:28:24 -05:00
|
|
|
|
2024-08-12 00:07:48 -07:00
|
|
|
typedef struct Sphere16 {
|
2020-04-18 22:28:24 -05:00
|
|
|
Vec3s center;
|
|
|
|
|
s16 radius;
|
2020-07-30 15:50:18 -04:00
|
|
|
} Sphere16; // size = 0x08
|
2020-04-18 22:28:24 -05:00
|
|
|
|
2024-08-12 00:07:48 -07:00
|
|
|
typedef struct Spheref {
|
2020-04-18 22:28:24 -05:00
|
|
|
Vec3f center;
|
|
|
|
|
f32 radius;
|
2020-07-30 15:50:18 -04:00
|
|
|
} Spheref; // size = 0x10
|
2020-04-18 22:28:24 -05:00
|
|
|
|
2024-08-12 00:07:48 -07:00
|
|
|
typedef struct PosRot {
|
2024-06-25 15:48:24 -07:00
|
|
|
/* 0x00 */ Vec3f pos;
|
|
|
|
|
/* 0x0C */ Vec3s rot;
|
|
|
|
|
} PosRot; // size = 0x14
|
|
|
|
|
|
2024-08-12 00:07:48 -07:00
|
|
|
typedef struct Plane {
|
2020-04-18 22:28:24 -05:00
|
|
|
Vec3f normal;
|
|
|
|
|
f32 originDist;
|
2020-07-30 15:50:18 -04:00
|
|
|
} Plane; // size = 0x10
|
2020-04-18 22:28:24 -05:00
|
|
|
|
2024-08-12 00:07:48 -07:00
|
|
|
typedef struct TriNorm {
|
2020-04-18 22:28:24 -05:00
|
|
|
Vec3f vtx[3];
|
|
|
|
|
Plane plane;
|
2020-07-30 15:50:18 -04:00
|
|
|
} TriNorm; // size = 0x34
|
2020-04-18 22:28:24 -05:00
|
|
|
|
2024-08-12 00:07:48 -07:00
|
|
|
typedef struct Cylinder16 {
|
2020-08-17 14:42:08 -05:00
|
|
|
/* 0x0000 */ s16 radius;
|
|
|
|
|
/* 0x0002 */ s16 height;
|
|
|
|
|
/* 0x0004 */ s16 yShift;
|
|
|
|
|
/* 0x0006 */ Vec3s pos;
|
2020-07-30 15:50:18 -04:00
|
|
|
} Cylinder16; // size = 0x0C
|
2020-04-18 22:28:24 -05:00
|
|
|
|
2024-08-12 00:07:48 -07:00
|
|
|
typedef struct Cylinderf {
|
2020-10-03 17:22:44 +02:00
|
|
|
/* 0x00 */ f32 radius;
|
|
|
|
|
/* 0x04 */ f32 height;
|
|
|
|
|
/* 0x08 */ f32 yShift;
|
|
|
|
|
/* 0x0C */ Vec3f pos;
|
2020-07-30 15:50:18 -04:00
|
|
|
} Cylinderf; // size = 0x18
|
2020-04-18 22:28:24 -05:00
|
|
|
|
2024-08-12 00:07:48 -07:00
|
|
|
typedef struct InfiniteLine {
|
2020-08-17 14:42:08 -05:00
|
|
|
/* 0x0000 */ Vec3f point;
|
|
|
|
|
/* 0x000C */ Vec3f dir;
|
|
|
|
|
} InfiniteLine; // size = 0x18
|
|
|
|
|
|
2024-08-12 00:07:48 -07:00
|
|
|
typedef struct Linef {
|
2020-08-17 14:42:08 -05:00
|
|
|
/* 0x0000 */ Vec3f a;
|
|
|
|
|
/* 0x000C */ Vec3f b;
|
2020-07-30 15:50:18 -04:00
|
|
|
} Linef; // size = 0x18
|
2020-04-18 22:28:24 -05:00
|
|
|
|
2024-08-12 00:07:48 -07:00
|
|
|
typedef struct VecSphGeo {
|
2022-10-15 09:43:59 -04:00
|
|
|
/* 0x0 */ f32 r; // radius
|
|
|
|
|
/* 0x4 */ s16 pitch; // depends on coordinate system. See below.
|
|
|
|
|
/* 0x6 */ s16 yaw; // azimuthal angle
|
|
|
|
|
} VecSphGeo; // size = 0x8
|
|
|
|
|
|
|
|
|
|
// Defines a point in the spherical coordinate system.
|
|
|
|
|
// Pitch is 0 along the positive y-axis (up)
|
|
|
|
|
typedef VecSphGeo VecSph;
|
|
|
|
|
|
|
|
|
|
// Defines a point in the geographic coordinate system.
|
|
|
|
|
// Pitch is 0 along the xz-plane (horizon)
|
|
|
|
|
typedef VecSphGeo VecGeo;
|
2020-04-30 09:49:11 -05:00
|
|
|
|
2025-04-25 21:12:35 -04:00
|
|
|
/**
|
|
|
|
|
* Macros
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
// General number macros
|
|
|
|
|
#define SQ(x) ((x)*(x))
|
|
|
|
|
#define ABS(x) ((x) >= 0 ? (x) : -(x))
|
|
|
|
|
#define DECR(x) ((x) == 0 ? 0 : --(x))
|
|
|
|
|
#define CLAMP(x, min, max) ((x) < (min) ? (min) : (x) > (max) ? (max) : (x))
|
|
|
|
|
#define CLAMP_MAX(x, max) ((x) > (max) ? (max) : (x))
|
|
|
|
|
#define CLAMP_MIN(x, min) ((x) < (min) ? (min) : (x))
|
|
|
|
|
|
|
|
|
|
#define SWAP(type, a, b) \
|
|
|
|
|
{ \
|
|
|
|
|
type _temp = (a); \
|
|
|
|
|
(a) = (b); \
|
|
|
|
|
(b) = _temp; \
|
|
|
|
|
} \
|
|
|
|
|
(void)0
|
|
|
|
|
|
|
|
|
|
// LERP macros
|
2021-09-20 11:51:35 -05:00
|
|
|
#define LERP(x, y, scale) (((y) - (x)) * (scale) + (x))
|
|
|
|
|
#define LERP32(x, y, scale) ((s32)(((y) - (x)) * (scale)) + (x))
|
2021-09-21 09:29:43 -07:00
|
|
|
#define LERP16(x, y, scale) ((s16)(((y) - (x)) * (scale)) + (x))
|
2021-09-20 11:51:35 -05:00
|
|
|
#define F32_LERP(v0,v1,t) ((v0) * (1.0f - (t)) + (v1) * (t))
|
decompile z_camera (#398)
* 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>
2020-12-06 16:39:47 -06:00
|
|
|
#define F32_LERPIMP(v0, v1, t) (v0 + ((v1 - v0) * t))
|
|
|
|
|
#define F32_LERPIMPINV(v0, v1, t) ((v0) + (((v1) - (v0)) / (t)))
|
2022-07-12 18:17:07 +02:00
|
|
|
#define BINANG_LERPIMP(v0, v1, t) ((v0) + (s16)((s16)((v1) - (v0)) * (t)))
|
|
|
|
|
#define BINANG_LERPIMPINV(v0, v1, t) ((v0) + (s16)((v1) - (v0)) / (t))
|
decompile z_camera (#398)
* 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>
2020-12-06 16:39:47 -06:00
|
|
|
|
|
|
|
|
#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); \
|
|
|
|
|
}
|
|
|
|
|
|
2025-04-25 21:12:35 -04:00
|
|
|
// Floating point macros
|
2020-08-17 14:42:08 -05:00
|
|
|
#define IS_ZERO(f) (fabsf(f) < 0.008f)
|
|
|
|
|
|
2022-12-13 02:55:57 +01:00
|
|
|
// Casting a float to an integer, when the float value is larger than what the integer type can hold,
|
|
|
|
|
// leads to undefined behavior. For example (f32)0x8000 doesn't fit in a s16, so it cannot be cast to s16.
|
|
|
|
|
// This isn't an issue with IDO, but is one with for example GCC.
|
|
|
|
|
// A partial workaround is to cast to s32 then s16, hoping all binang values used will fit a s32.
|
|
|
|
|
#define TRUNCF_BINANG(f) (s16)(s32)(f)
|
|
|
|
|
|
2022-04-24 16:23:49 +02:00
|
|
|
// Angle conversion macros
|
2022-12-13 02:55:57 +01:00
|
|
|
#define DEG_TO_BINANG(degrees) (s16)TRUNCF_BINANG((degrees) * (0x8000 / 180.0f))
|
|
|
|
|
#define RAD_TO_BINANG(radians) (s16)TRUNCF_BINANG((radians) * (0x8000 / M_PI))
|
2022-04-24 16:23:49 +02:00
|
|
|
#define RAD_TO_DEG(radians) ((radians) * (180.0f / M_PI))
|
decompile z_camera (#398)
* 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>
2020-12-06 16:39:47 -06:00
|
|
|
#define DEG_TO_RAD(degrees) ((degrees) * (M_PI / 180.0f))
|
2022-04-24 16:23:49 +02:00
|
|
|
#define BINANG_TO_DEG(binang) ((f32)(binang) * (180.0f / 0x8000))
|
2022-03-20 01:16:33 +01:00
|
|
|
#define BINANG_TO_RAD(binang) ((f32)(binang) * (M_PI / 0x8000))
|
|
|
|
|
#define BINANG_TO_RAD_ALT(binang) (((f32)(binang) / (f32)0x8000) * M_PI)
|
2022-04-03 20:32:18 +02:00
|
|
|
#define BINANG_TO_RAD_ALT2(binang) (((f32)(binang) * M_PI) / 0x8000)
|
2020-08-17 14:42:08 -05:00
|
|
|
|
2024-08-18 18:55:25 -07:00
|
|
|
// Angle conversion macros required for matching. These were probably the original macros used, but
|
|
|
|
|
// we prefer DEG_TO_BINANG/RAD_TO_BINANG where possible to avoid possible undefined behavior with input
|
|
|
|
|
// values outside of [-180, 180) degrees or [-PI, PI) radians.
|
|
|
|
|
#if PLATFORM_N64
|
|
|
|
|
#define DEG_TO_BINANG2(degrees) (f32)((degrees) * (0x8000 / 180.0f))
|
|
|
|
|
#define RAD_TO_BINANG2(radians) (f32)((radians) * (0x8000 / M_PI))
|
|
|
|
|
#else
|
|
|
|
|
#define DEG_TO_BINANG2(degrees) (s32)((degrees) * (0x8000 / 180.0f))
|
|
|
|
|
#define RAD_TO_BINANG2(radians) (s32)((radians) * (0x8000 / M_PI))
|
|
|
|
|
#endif
|
|
|
|
|
|
Merge decomp/main (#141)
* Match retail BSS ordering (#1927)
* Match retail BSS ordering
* Revert moving some global variables to headers
* Adjust block numbers after header changes
* Fix debug build
* Overlay bss ordering
* Fix BSS ordering after header changes
* gc-eu-mq OK
* Implement preprocessor for #pragma increment_block_number
* Transfer usage comment from reencode.sh
* Use temporary directory instead of temporary file
* Move ColChkMassType back
* Player: Document "WaitForPutAway" (#1936)
* document put away delay
* functions.txt
* add a note on delaying indefinitely
* format
* typo
* delay -> wait for put away
* revert unintended formatting change
* add comment to struct member
* format
* fix functions.txt
* Set up gc-eu and match all code (#1938)
* Set up gc-eu and match all code
* Format
* Mark gc-eu-mq as WIP until it builds OK
* Move original/MQ map mark data to separate files
* Add #includes to .inc.c files to help out VS Code
* Use #if in spec instead of .inc.c files
* Delete disassembly data for gc-eu-mq (#1942)
* Player Docs: "sUpperBodyIsBusy" (#1944)
* document upperbodybusy
* change wording for comment and rename upperanimblendweight
* format
* review
* Fix miscategorized scenes (#1946)
* Fix miscategorized scenes
* Sort includes
* Player Docs: Action Interrupt (#1947)
* document action interrupt
* format
* new function comment
* format
* add a note about items
* format
* Add gc-eu-mq to CI (#1943)
* Add gc-eu-mq to CI
* Give up on scripting
* Revert quotes changes
* Player Docs: Name some high level update calls (#1593)
* name some low hanging fruit
* revert burn and shock, doing in seperate pr
* add some function comments
* yaw func
* adjust comment
* some review
* unname UpdateZTarget
* Player_DetectRumbleSecrets
* fix dive do action name
* Player Docs: Control stick buffers (#1945)
* name vars and add enum
* name some spin attack stuff
* fix right and left
* forward/backward
* format
* fix retail bss
* sControlStickWorldYaw
* Force string.o to be in boot for gcc builds (#1948)
In retail builds, memcpy is linked in code, not boot, but GCC likes to call memcpy when copying structs so currently GCC builds immediately crash in __osInitialize_common.
* Rename yDistToWater -> depthInWater (#1950)
* Rename yDistToWater -> yDistUnderWater
* yDistUnderWater -> depthInWater
* Check baserom hash before decompression (#1952)
* Remove Cygwin support (#1951)
* Document pause page switching (#1550)
* Document pause page switching
* document initial scroll left setup, when opening the pause menu
* `PAUSE_MAIN_STATE_1` -> `PAUSE_MAIN_STATE_SWITCHING_PAGE`
* try a diagram of the pages layout in world space as a comment
* expand `nextPageMode` comment
* touch up pause camera header comments
* expand comment on irrelevant init `mainState = PAUSE_MAIN_STATE_SWITCHING_PAGE`
* expand doc on `sKaleidoSetup*` data
* expand docs on `gPageSwitchNextButtonStatus`
* add some doc on `sPageSwitch*` arrays
* SwitchPage -> PageSwitch
* add `PAGE_SWITCH_NSTEPS`
* `SWITCH_PAGE_*_PT` -> `PAGE_SWITCH_PT_*`
* peepoArtist
---------
Co-authored-by: fig02 <fig02srl@gmail.com>
* Fix LensMode Enum Names (#1954)
* Change linker script so gGameOverTimer can be in z_game_over.c (#1939)
* Change linker script so gGameOverTimer can be in z_game_over.c
* gGameOverTimer -> sGameOverTimer
* include_data_only_with_rodata -> include_data_only_within_rodata
* fix build issues
* Check buffers segment in check_ordering.py (#1960)
* Delete unused yaz0tool (#1959)
* Revamp "AnimationContext" Docs, now called "AnimTaskQueue" (#1941)
* start using task terminology
* more docs
* format
* cleanups
* MoveActor -> ActorMove
* missed a couple
* hopefully the last changes
* comment explaining the group change
* some review
* dragorn review
* remove accidental file
* fix matching issue, now use while loop
* Experiment: remove global.h dependency from sys_math, sys_math3d, z_lib (#1956)
* split sys_math, sys_math3d, z_lib from global.h
* suggestions
* forgot this
* more math stuff
* nit fix
* re-add ichain.h
* resolve tharo's comments
* Fix check_ordering.py checking for shifted/nonmatching-besides-relocs (#1961)
* Run CC_CHECK with the correct CPP defines (#1963)
* Run CC_CHECK with the correct CPP defines
* Add "CPP_DEFINES ?="
---------
Co-authored-by: cadmic <cadmic24@gmail.com>
Co-authored-by: fig02 <fig02srl@gmail.com>
Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
Co-authored-by: inspectredc <78732756+inspectredc@users.noreply.github.com>
Co-authored-by: mzxrules <mzxrules@gmail.com>
2024-06-22 22:36:26 +02:00
|
|
|
// Angle conversion macros (Camera)
|
|
|
|
|
// these two angle conversion macros are slightly inaccurate
|
|
|
|
|
#define CAM_DEG_TO_BINANG(degrees) (s16)TRUNCF_BINANG((degrees) * 182.04167f + .5f)
|
|
|
|
|
#define CAM_BINANG_TO_DEG(binang) ((f32)(binang) * (360.0001525f / 65535.0f))
|
|
|
|
|
|
2020-12-27 10:13:38 -06:00
|
|
|
// Vector macros
|
2025-04-25 21:12:35 -04:00
|
|
|
#define VEC_SET(V,X,Y,Z) (V).x=(X);(V).y=(Y);(V).z=(Z)
|
2022-11-13 23:47:25 +01:00
|
|
|
#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)
|
2020-12-27 10:13:38 -06:00
|
|
|
|
2020-04-18 22:28:24 -05:00
|
|
|
#endif
|