2020-04-19 03:28:24 +00:00
|
|
|
#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;
|
|
|
|
|
|
|
|
typedef struct {
|
|
|
|
f32 x, y, z;
|
|
|
|
} Vec3f;
|
|
|
|
|
|
|
|
typedef struct {
|
|
|
|
s16 x, y, z;
|
|
|
|
} Vec3s;
|
|
|
|
|
|
|
|
typedef struct {
|
|
|
|
s32 x, y, z;
|
|
|
|
} Vec3i;
|
|
|
|
|
|
|
|
typedef struct {
|
|
|
|
Vec3s center;
|
|
|
|
s16 radius;
|
|
|
|
} Sphere16;
|
|
|
|
|
|
|
|
typedef struct {
|
|
|
|
Vec3f center;
|
|
|
|
f32 radius;
|
|
|
|
} Spheref;
|
|
|
|
|
|
|
|
|
|
|
|
typedef struct {
|
|
|
|
Vec3f normal;
|
|
|
|
f32 originDist;
|
|
|
|
} Plane;
|
|
|
|
|
|
|
|
typedef struct {
|
|
|
|
Vec3f vtx[3];
|
|
|
|
Plane plane;
|
z_collision_check.c (#73)
* func_8005B280 ok
* func_8005B65C OK
* split out func_8005BD50
* func_8005B7C0 OK
* func_8005B7F4 OK
* func_8005B824 OK
* func_8005B860 ok
* improve sanity
* func_8005B6B0 ok, ColliderInit_Actor structs added
* func_8005B884 ok
* func_8005BBF8 ok, split out func_8005BF50
* split more stuff out of func_8005C050.s
* func_8005C050 OK
* func_8005BA30 fakish OK, func_8005BAD8 real OK
* func_8005BB48 OK, func_8005BA84 almost decomp'd, but type issues
* func_8005BB10 Ok
* func_8005BF50 OK
* func_8005BE50 OK
* func_8005BD50 OK
* func_8005BCC8 Ok
* func_8005BC28
* func_8005BB8C func_8005BBB0 func_8005BBD4 Ok
* save my work commit
* func_8005C2BC fake OK
* func_8005C5B0 ok
* func_8005C608 ok
* func_8005C6C0 ok
* func_8005C6F8 ok
* func_8005C730 ok
* func_8005C774 func_8005C798 func_8005C7BC OK
* func_8005C7E0 ok, func_8005C810 split
* func_8005C810 OK
* func_8005C8C8 ok
* func_8005C964 OK
* func_8005CA88 ok
* func_8005CBAC ok
* func_8005C124 func_8005C1AC func_8005C234 func_8005CC98 OK
* func_8005CD34 func_8005CDD0 Ok
* func_8005CE6C ok
* func_8005CEC4 ok
* func_8005CEDC ok
* func_8005CF90 Ok
* standardize type names/vars more
* func_8005D3BC ok
* func_8005D40C OK, z64.h CollisionCheckContext
* func_8005D4B4 func_8005D4C8 ok
* partial data section migration
* improve function documentation, OT->OC
* Actor_CollisionCheck_SetOC ok
* Actor_CollisionCheck_SetAT Actor_CollisionCheck_SetAC Ok
* func_8005BA84 ok
* func_800611A0 ok
* func_80061274 ok
* clean up func_80061274
* func_8006139C ok
* func_8005E9C0 and dependencies OK
* minor cleanup to func_8005E9C0
* func_8005EC6C OK!
* func_8005E81C ok
* func_8005E604 ok
* func_8005E2EC func_8005E4F8 OK
* func_8005DE9C OK func_8005D8AC disassembled
* func_8006146C func_8006268C ok
* func_8005EEE0 ok
* func_8005F17C
* func_8005F39C ok
* func_8005F5B0 decompiled, not matching
* func_8005F7D0 decomp, func_8005D218 and func_8005D324 OK
* func_8005FA30 ok, split more functions
* func_8005FC04 ok
* func_8005FDCC k
* func_8005FF90 OK OK OK
* func_80060204 dead
* func_800604B0 ok
* func_80060704 func_80060994 ok, func_80060C2C somewhat disassembled. AT to AC matrix doneish
* func_800635D0 ok, func_80062ECC not so much
* OcLine oks
* D_8011DF28 functions disassembled
* D_8011DF5C functions OK
* setAT_SAC. setAC_SAC, setOC_SAC OK
* func_80061C98 decompiled, func_80061BF4, func_80061C18 OK
* func_800617D4 ok, func_800614A4 disassembled
* CollisionCheck_OC D_8011DFAC functions OK
* func_80062530 ok
* CollisionCheck_generalLineOcCheck subfunctions OK
* func_800622E4 ok
* after a long fought battle, func_80061F64 has fallen.
* func_800628A4 disassembled
* func_800627A0 func_8006285C OK
* ActorCollider_Cylinder_Update, func_80062718, func_80062734 ok
* func_80062CD4 decompiled, import EffShield/EffSpark types from MM
* various SubActor98 struct functions OK
* func_8005D4DC func_8005D62C ok
* .data section migrated, more OKs, fix NON_MATCHINGs to use effect structs
* func_80060C2C ok
* minor code tweaks
* func_80061C98 ok somehow
* Attempt to fix some unknowns, move types out of z64actor, add set3 ColliderInit types
* Apply changes
* formatting
* tweak a couple function names
* krim changes, func naming
* missed some things
* function renames
* Implement GenColliderInit.py utility
* Implement pr changes, GenColliderInit.py, DamageTable.py, z_collision_btltbls.c fully matching
* func_800614A4 ok
* Implement Roman's fixes, name Collider unknowns, rename COLTYPE -> COLSHAPE and define new COLTYPE
* collisionCheckCtx -> colChkCtx, fix small things
2020-04-26 02:43:35 +00:00
|
|
|
} TriNorm; //size = 0x34
|
2020-04-19 03:28:24 +00:00
|
|
|
|
|
|
|
typedef struct {
|
|
|
|
s16 radius;
|
|
|
|
s16 height;
|
|
|
|
s16 yShift;
|
|
|
|
Vec3s pos;
|
|
|
|
} Cylinder16;
|
|
|
|
|
|
|
|
typedef struct {
|
|
|
|
f32 radius;
|
|
|
|
f32 height;
|
|
|
|
f32 yShift;
|
|
|
|
Vec3f pos;
|
|
|
|
} Cylinderf;
|
|
|
|
|
|
|
|
typedef struct {
|
|
|
|
Vec3f a;
|
|
|
|
Vec3f b;
|
|
|
|
} Linef;
|
|
|
|
|
2020-04-30 14:49:11 +00:00
|
|
|
// Defines a point in the spherical coordinate system
|
|
|
|
typedef struct {
|
|
|
|
f32 r; // radius
|
|
|
|
s16 phi; // polar (zenith) angle
|
|
|
|
s16 theta; // azimuthal angle
|
|
|
|
} VecSph;
|
|
|
|
|
2020-04-19 03:28:24 +00:00
|
|
|
#endif
|