mirror of
https://github.com/n64decomp/mk64
synced 2026-08-09 10:32:13 -04:00
Replace mk_Vtx_Flag type with GBI provided Vtx (#160)
There's no reason to have our own special type when it exactly matches a GBI type. This required updating some inc.c data as the old mk_Vtx_Flag type had the 'flag' member in the incorrect location. Signed-off-by: Taggerung <tyler.taggerung@gmail.com>
This commit is contained in:
@@ -190,6 +190,8 @@ typedef struct {
|
||||
/* 0x46 */ s16 unk_046;
|
||||
} UnkPlayerStruct258; // size = 0x48
|
||||
|
||||
// This struct is almost identical to the GBI Vtx_t type,
|
||||
// except that its missing the "flag" member.
|
||||
typedef struct {
|
||||
s16 ob[3]; /* x, y, z */
|
||||
s16 tc[2]; /* texture coord */
|
||||
@@ -197,14 +199,6 @@ typedef struct {
|
||||
|
||||
} mk64_Vtx;
|
||||
|
||||
typedef struct {
|
||||
s16 ob[3]; /* x, y, z */
|
||||
s16 tc[2]; /* texture coord */
|
||||
s8 flag[2]; /* unk flag */
|
||||
u8 ca[4]; /* color & alpha */
|
||||
|
||||
} mk_Vtx_Flag;
|
||||
|
||||
/*
|
||||
This struct has been copied (with only minor modifications) from
|
||||
https://github.com/micro500/mariokart64/wiki/Surface-Map
|
||||
@@ -222,7 +216,7 @@ typedef struct {
|
||||
/* 0x02 */ u16 surfaceType;
|
||||
/* 0x04 */ s16 vtx3[3]; //X, Y, Z of poly's third vertex
|
||||
/* 0x0A */ s16 vtx2[3]; //X, Y, Z of poly's second vertex
|
||||
/* 0x10 */ mk_Vtx_Flag *vtxs[3]; //pointer to the 3 vertices of this poly
|
||||
/* 0x10 */ Vtx *vtxs[3]; //pointer to the 3 vertices of this poly
|
||||
//unsure why this exists along with a copy of two of the vertices.
|
||||
//both are involved in hit detection.
|
||||
/* 0x1C */ f32 height;
|
||||
|
||||
Reference in New Issue
Block a user