2022-05-26 03:24:39 +00:00
|
|
|
#ifndef Z64MATH_H
|
|
|
|
#define Z64MATH_H
|
2020-08-31 23:02:37 +00:00
|
|
|
|
Overhaul the build system (#234)
* wip
* fix
* add disassembler
* Disasm builds OK
* Variable addends
* More wip
* Rodata migration implemented
* Cleanup old tools
* Try fix submodule -> subrepo merge
* git subrepo pull --force --remote=https://github.com/zeldaret/ZAPD.git tools/ZAPD
subrepo:
subdir: "tools/ZAPD"
merged: "602e609"
upstream:
origin: "https://github.com/zeldaret/ZAPD.git"
branch: "master"
commit: "602e609"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo"
commit: "2f68596"
* Builds again but assets are totally broken
* git subrepo pull --force tools/asm-processor
subrepo:
subdir: "tools/asm-processor"
merged: "1ffdb08a"
upstream:
origin: "https://github.com/simonlindholm/asm-processor.git"
branch: "master"
commit: "1ffdb08a"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo"
commit: "2f68596"
* More cleanup, move functions.txt and variables.txt to tools/disasm and rm tables
* rm z64compress in preparation for subrepo
* git subrepo clone (merge) https://github.com/z64me/z64compress.git tools/z64compress
subrepo:
subdir: "tools/z64compress"
merged: "eb11085c"
upstream:
origin: "https://github.com/z64me/z64compress.git"
branch: "main"
commit: "eb11085c"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo"
commit: "2f68596"
* Fix asset extraction
* Fix diff-init make rule
* Split code bss
* Split assumed linker bug padding from assembly files
* add filelists for mm.us.rev1
* Maybe working, but I'm not sure
* add overlays to spec
* Add rodata to actos
* Everything compiles
* Make a lot of C files for code
* Add almost every file in code to spec
* whoops
* 3 code files left
* add scenes to spec
* More progress on progress.py
* Fix skelanime in spec
* audio files!
* Fix merge issues
* Fix some C files in code
* Fix remaining code files
* Use existing O1 C files in spec
* reorder boot order in spec
* update spec
* fault.c
* Convert relocs on completed actors, fixbaserom uses current rom name
* more boot files
* Add VT macros and script
* finish already existing boot files
* most of libultra
* fix 64bits libultra files
* Use C files for libultra, wrap some functions in NON_MATCHING
* Remove duplicate of OS_CLOCK_RATE from fault.c
* C files for fbdemos
* delete dumb files
* bootstrap C files, still need to add them to the spec
* update fixbaserom
* boot OK?
* I forgot to commit the spec
* C for gamestates
* C for kaleido
* Change all includes to ""
* copy actor sizes script from oot
* I forgot to delete those files
* Basic C files for effects
* Add effects initvars names
* Remove mislabelled boot functions from header/txt
* Begin porting bootstrap_fx, some sizes
* Fix <>
* Fix enum
* Fix diff.py
* fix libultra stuff
* update regconvert
* update setup warnings
* add some missing ;
* Fix some makefile stuff and other fixes on some non_matching functions
* add executable flag in extract_baserom and fixbaserom
* fix relative path
* copy assist from oot
* fix map path
* another assist path fix
* Delete C files for handwritten files
* add code_801A51F0 to spec
* add gfxbuffers to spec
* Move rodata to top of each file when possible
* UNK_TYPEs for func_801A51F0
* Remove kaleido rodata from spec
* Update spec and undefined_syms for recent merge
* GCC warnings and fix errors in nonmatchings,
* round percentage numbers
* progress script: format changes
* progress: error on non-existing files
* fix warning in z_scene_table
* Match 2 nonmatchings in z_actor
* Warnings in lightswitch and invadepoh
* Fix warning in z_actor_dlftbls
* I though I fixed this one
* whoops
* Comment out CC_CHECK
* Removed redundant ultra64.h includes
* Update asm_processor, sorted boot_O1 into other folders, completed the fbdemo bootstrap, cleaned up undefined_syms
* Completed gamestates bootstrap
* Split kaleido_scope
* Remove section.h and segment.h, move keep object externs to a common location in variables.h
* Completed effects bootstrap
* Segmented address externs for effects, fbdemos, gamestates and kaleido
* Move actor data externs out of the if 0
* Segmented address externs for actors
* Prepare actionfunc detection
* fix script, how did it even work before
* Fix actionfunc script again, re-introduce some more intermediate prints to the disassembler
* Automated actionFunc detection in actors
* Segmented addresses from player .text
* rm old segment addrs script and fix build
* Move sizes folder to tools
* Make build.py executable
* New Jenkinsfile Prayge
* Remove numpy dependencies
* Add warnings_disasm_current.txt
* my bad
* Update spec and undefined_syms
* Add z_eff_ss_hahen to pametfrog
* git subrepo pull (merge) --force tools/z64compress
subrepo:
subdir: "tools/z64compress"
merged: "163ca2af"
upstream:
origin: "https://github.com/z64me/z64compress.git"
branch: "main"
commit: "163ca2af"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo"
commit: "2f68596"
* Make z64compress print to stdout
* sneeky commit to update warnings tooling
* test
* Another test
* Mark fixing overlay reloc generating as a TODO
* Update warnings stuff
* Communicate the return code from running z64compress back to the Makefile through the wrapper
* Run formatter, remove extra commented copy of function
* Re-fix some includes
* Convert atan to hex to conform to decided style
* Some tidying up, remove c for fp and the other two handwritten code files
* BSS in z_collision_check & z_scene_proc
* add static back in
* Fix timerintr bss, add file to spec, some cleanup
* Remove externs
* Newline
* Readd enums
* Typo
* Colours
* Comments for hitmark enum values
Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
* Improvements and suggestions
* Organize and remove unused imports and use env for python3 scripts, delete unused overlay.py
Co-authored-by: angie <angheloalf95@gmail.com>
Co-authored-by: Elliptic Ellipsis <elliptic.ellipsis@gmail.com>
Co-authored-by: engineer124 <engineer124engineer124@gmail.com>
Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
2021-08-04 03:21:31 +00:00
|
|
|
#include "ultra64.h"
|
2020-08-31 23:02:37 +00:00
|
|
|
|
2021-03-22 21:48:15 +00:00
|
|
|
#define VEC_SET(V,X,Y,Z) V.x=X;V.y=Y;V.z=Z
|
|
|
|
|
2022-03-26 01:19:14 +00:00
|
|
|
typedef struct {
|
2022-08-07 23:43:58 +00:00
|
|
|
/* 0x0 */ s16 x;
|
|
|
|
/* 0x2 */ s16 z;
|
|
|
|
} Vec2s; // size = 0x4
|
2022-03-26 01:19:14 +00:00
|
|
|
|
2021-03-22 21:48:15 +00:00
|
|
|
typedef struct {
|
2022-08-07 23:43:58 +00:00
|
|
|
/* 0x0 */ f32 x;
|
|
|
|
/* 0x4 */ f32 z;
|
|
|
|
} Vec2f; // size = 0x8
|
2021-03-22 21:48:15 +00:00
|
|
|
|
|
|
|
typedef struct {
|
2022-08-07 23:43:58 +00:00
|
|
|
/* 0x0 */ f32 x;
|
|
|
|
/* 0x4 */ f32 y;
|
|
|
|
/* 0x8 */ f32 z;
|
|
|
|
} Vec3f; // size = 0xC
|
2021-03-22 21:48:15 +00:00
|
|
|
|
|
|
|
typedef struct {
|
2022-08-07 23:43:58 +00:00
|
|
|
/* 0x0 */ u16 x;
|
|
|
|
/* 0x2 */ u16 y;
|
|
|
|
/* 0x4 */ u16 z;
|
|
|
|
} Vec3us; // size = 0x6
|
2021-03-22 21:48:15 +00:00
|
|
|
|
2020-08-31 23:02:37 +00:00
|
|
|
typedef struct {
|
2022-08-07 23:43:58 +00:00
|
|
|
/* 0x0 */ s16 x;
|
|
|
|
/* 0x2 */ s16 y;
|
|
|
|
/* 0x4 */ s16 z;
|
|
|
|
} Vec3s; // size = 0x6
|
2020-08-31 23:02:37 +00:00
|
|
|
|
|
|
|
typedef struct {
|
2022-08-07 23:43:58 +00:00
|
|
|
/* 0x0 */ s32 x;
|
|
|
|
/* 0x4 */ s32 y;
|
|
|
|
/* 0x8 */ s32 z;
|
|
|
|
} Vec3i; // size = 0xC
|
2021-03-22 21:48:15 +00:00
|
|
|
|
|
|
|
typedef struct {
|
2022-08-07 23:43:58 +00:00
|
|
|
/* 0x0 */ Vec3s center;
|
|
|
|
/* 0x6 */ s16 radius;
|
|
|
|
} Sphere16; // size = 0x8
|
2021-03-22 21:48:15 +00:00
|
|
|
|
|
|
|
typedef struct {
|
2022-08-07 23:43:58 +00:00
|
|
|
/* 0x0 */ Vec3f center;
|
|
|
|
/* 0xC */ f32 radius;
|
2021-03-22 21:48:15 +00:00
|
|
|
} Spheref; // size = 0x10
|
|
|
|
|
2022-04-22 04:11:54 +00:00
|
|
|
/*
|
|
|
|
The plane paramaters are of form `ax + by + cz + d = 0`
|
|
|
|
where `(a,b,c)` is the plane's normal vector and d is the originDist
|
|
|
|
*/
|
2021-03-22 21:48:15 +00:00
|
|
|
typedef struct {
|
|
|
|
/* 0x00 */ Vec3f normal;
|
|
|
|
/* 0x0C */ f32 originDist;
|
|
|
|
} Plane; // size = 0x10
|
|
|
|
|
|
|
|
typedef struct {
|
|
|
|
/* 0x00 */ Vec3f vtx[3];
|
|
|
|
/* 0x24 */ Plane plane;
|
|
|
|
} TriNorm; // size = 0x34
|
|
|
|
|
|
|
|
typedef struct {
|
2022-08-07 23:43:58 +00:00
|
|
|
/* 0x0 */ s16 radius;
|
|
|
|
/* 0x2 */ s16 height;
|
|
|
|
/* 0x4 */ s16 yShift;
|
|
|
|
/* 0x6 */ Vec3s pos;
|
|
|
|
} Cylinder16; // size = 0xC
|
2021-03-22 21:48:15 +00:00
|
|
|
|
|
|
|
typedef struct {
|
|
|
|
/* 0x00 */ f32 radius;
|
|
|
|
/* 0x04 */ f32 height;
|
|
|
|
/* 0x08 */ f32 yShift;
|
|
|
|
/* 0x0C */ Vec3f pos;
|
|
|
|
} Cylinderf; // size = 0x18
|
|
|
|
|
|
|
|
typedef struct {
|
|
|
|
/* 0x00 */ Vec3f point;
|
|
|
|
/* 0x0C */ Vec3f dir;
|
|
|
|
} InfiniteLine; // size = 0x18
|
|
|
|
|
|
|
|
typedef struct {
|
|
|
|
/* 0x00 */ Vec3f a;
|
|
|
|
/* 0x0C */ Vec3f b;
|
|
|
|
} LineSegment; // size = 0x18
|
|
|
|
|
|
|
|
// Defines a point in the spherical coordinate system
|
|
|
|
typedef struct {
|
2022-08-07 23:43:58 +00:00
|
|
|
/* 0x0 */ f32 r; // radius
|
|
|
|
/* 0x4 */ s16 pitch; // polar (zenith) angle
|
|
|
|
/* 0x6 */ s16 yaw; // azimuthal angle
|
|
|
|
} VecSph; // size = 0x8
|
2021-03-22 21:48:15 +00:00
|
|
|
|
2021-12-27 02:51:16 +00:00
|
|
|
#define LERPIMP(v0, v1, t) ((v0) + (((v1) - (v0)) * (t)))
|
|
|
|
#define F32_LERP(v0, v1, t) ((1.0f - (t)) * (f32)(v0) + (t) * (f32)(v1))
|
|
|
|
#define F32_LERPIMP(v0, v1, t) ((f32)(v0) + (((f32)(v1) - (f32)(v0)) * (t)))
|
|
|
|
#define F32_LERPIMPINV(v0, v1, t) ((f32)(v0) + (((f32)(v1) - (f32)(v0)) / (t)))
|
2021-07-14 01:59:04 +00:00
|
|
|
#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))
|
|
|
|
|
2022-09-14 15:51:10 +00:00
|
|
|
#define LERPWEIGHT(val, prev, next) (((val) - (prev)) / ((next) - (prev)))
|
|
|
|
#define F32_LERPWEIGHT(val, prev, next) (((f32)(val) - (f32)(prev)) / ((f32)(next) - (f32)(prev)))
|
|
|
|
|
2021-07-14 01:59:04 +00: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); \
|
|
|
|
}
|
|
|
|
|
2021-03-22 21:48:15 +00:00
|
|
|
#define IS_ZERO(f) (fabsf(f) < 0.008f)
|
|
|
|
|
2022-06-19 02:38:10 +00:00
|
|
|
// Angle conversion macros
|
|
|
|
#define DEG_TO_BINANG(degrees) (s16)((degrees) * (0x8000 / 180.0f))
|
|
|
|
#define RADF_TO_BINANG(radf) (s16)((radf) * (0x8000 / M_PI))
|
|
|
|
#define RADF_TO_DEGF(radf) ((radf) * (180.0f / M_PI))
|
|
|
|
#define DEGF_TO_RADF(degf) ((degf) * (M_PI / 180.0f))
|
|
|
|
#define BINANG_TO_RAD(binang) (((f32)binang / 0x8000) * M_PI)
|
|
|
|
|
|
|
|
// Angle arithmetic macros
|
2021-07-14 01:59:04 +00:00
|
|
|
#define BINANG_ROT180(angle) ((s16)(angle + 0x8000))
|
|
|
|
#define BINANG_SUB(a, b) ((s16)(a - b))
|
2021-08-06 21:14:09 +00:00
|
|
|
#define BINANG_ADD(a, b) ((s16)(a + b))
|
2021-07-14 01:59:04 +00:00
|
|
|
|
2021-03-22 21:48:15 +00:00
|
|
|
// 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))
|
2020-08-31 23:02:37 +00:00
|
|
|
|
|
|
|
#endif
|