summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorlouist103 <35883445+louist103@users.noreply.github.com>2020-07-30 15:50:18 -0400
committerGitHub <noreply@github.com>2020-07-30 21:50:18 +0200
commit449b2247fdbe3cd3c424637ec7d6973caa697f0f (patch)
tree79950f8f3806cfe9589eb03832be6ab612cf8510 /include
parentc3421dda0c841d3d905ac23601dc84e2cb71034d (diff)
Math Sizes (#297)
* Math Sizes Added sizes to most variable types * Removed sizes and fixed pads Removed sizes from base types and cleaned up pads * PR fixes
Diffstat (limited to 'include')
-rw-r--r--include/ultra64/types.h4
-rw-r--r--include/z64math.h26
2 files changed, 15 insertions, 15 deletions
diff --git a/include/ultra64/types.h b/include/ultra64/types.h
index ae8cecd6f..9a34f3dd9 100644
--- a/include/ultra64/types.h
+++ b/include/ultra64/types.h
@@ -10,11 +10,11 @@ typedef unsigned int u32;
typedef signed long long int s64;
typedef unsigned long long int u64;
-typedef volatile u8 vu8;
+typedef volatile u8 vu8;
typedef volatile u16 vu16;
typedef volatile u32 vu32;
typedef volatile u64 vu64;
-typedef volatile s8 vs8;
+typedef volatile s8 vs8;
typedef volatile s16 vs16;
typedef volatile s32 vs32;
typedef volatile s64 vs64;
diff --git a/include/z64math.h b/include/z64math.h
index 1b7d424a0..1aa535b72 100644
--- a/include/z64math.h
+++ b/include/z64math.h
@@ -7,69 +7,69 @@
typedef struct {
f32 x, y;
-} Vec2f;
+} Vec2f; // size = 0x08
typedef struct {
f32 x, y, z;
-} Vec3f;
+} Vec3f; // size = 0x0C
typedef struct {
u16 x, y, z;
-} Vec3us;
+} Vec3us; // size = 0x06
typedef struct {
s16 x, y, z;
-} Vec3s;
+} Vec3s; // size = 0x06
typedef struct {
s32 x, y, z;
-} Vec3i;
+} Vec3i; // size = 0x0C
typedef struct {
Vec3s center;
s16 radius;
-} Sphere16;
+} Sphere16; // size = 0x08
typedef struct {
Vec3f center;
f32 radius;
-} Spheref;
+} Spheref; // size = 0x10
typedef struct {
Vec3f normal;
f32 originDist;
-} Plane;
+} Plane; // size = 0x10
typedef struct {
Vec3f vtx[3];
Plane plane;
-} TriNorm; //size = 0x34
+} TriNorm; // size = 0x34
typedef struct {
s16 radius;
s16 height;
s16 yShift;
Vec3s pos;
-} Cylinder16;
+} Cylinder16; // size = 0x0C
typedef struct {
f32 radius;
f32 height;
f32 yShift;
Vec3f pos;
-} Cylinderf;
+} Cylinderf; // size = 0x18
typedef struct {
Vec3f a;
Vec3f b;
-} Linef;
+} Linef; // size = 0x18
// Defines a point in the spherical coordinate system
typedef struct {
f32 r; // radius
s16 phi; // polar (zenith) angle
s16 theta; // azimuthal angle
-} VecSph;
+} VecSph; // size = 0x08
#endif