kobayashi90/marioparty4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Change vector2 type name

Browse source
This commit is contained in:
gamemasterplc 2024-04-23 17:09:47 -05:00
parent 1e83c979fb
commit 7703c88607
2 changed files with 17 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

4
include/ext_math.h
View file

@ -4,10 +4,10 @@
#include "math.h" #include "math.h"
#include "dolphin/mtx.h" #include "dolphin/mtx.h"
typedef struct vector2 { typedef struct vec2f {
float x; float x;
float y; float y;
} Vector2; } Vec2f;
#define ABS(x) (((x) < 0) ? -(x) : (x)) #define ABS(x) (((x) < 0) ? -(x) : (x))

30
src/REL/E3setupDLL/main.c
View file

@ -437,7 +437,7 @@ typedef struct e3_player_cnt_work {
AnimData *frame[3]; AnimData *frame[3];
AnimData *arrow; AnimData *arrow;
AnimData *arrowHilite; AnimData *arrowHilite;
Vector2 winSize; Vec2f winSize;
s16 frameGroup; s16 frameGroup;
s16 arrowGroupL; s16 arrowGroupL;
s16 arrowGroupR; s16 arrowGroupR;
@ -550,8 +550,8 @@ static void InitPlayerCnt(omObjData *object)
s16 group; s16 group;
AnimData *anim; AnimData *anim;
u32 mess; u32 mess;
float sizeMax[2]; //FIXME: Change to Vector2 float sizeMax[2]; //FIXME: Change to Vec2f
float size[2]; //FIXME: Change to Vector2 float size[2]; //FIXME: Change to Vec2f
omSetStatBit(object, 0x100); omSetStatBit(object, 0x100);
object->data = HuMemDirectMallocNum(HEAP_SYSTEM, sizeof(E3PlayerCntWork), MEMORY_DEFAULT_NUM); object->data = HuMemDirectMallocNum(HEAP_SYSTEM, sizeof(E3PlayerCntWork), MEMORY_DEFAULT_NUM);
@ -614,7 +614,7 @@ static void InitPlayerCnt(omObjData *object)
HuWinMesMaxSizeGet(4, sizeMax, 0x220001, 0x220002, 0x220003, 0x220004); HuWinMesMaxSizeGet(4, sizeMax, 0x220001, 0x220002, 0x220003, 0x220004);
index2 = HuWinCreate(-10000, 58, sizeMax[0], sizeMax[1], 0); index2 = HuWinCreate(-10000, 58, sizeMax[0], sizeMax[1], 0);
work->winPlayer = index2; work->winPlayer = index2;
work->winSize = *(Vector2 *)(sizeMax); //FIXME: Remove Cast work->winSize = *(Vec2f *)(sizeMax); //FIXME: Remove Cast
HuWinBGTPLvlSet(index2, 0); HuWinBGTPLvlSet(index2, 0);
HuWinMesSpeedSet(index2, 0); HuWinMesSpeedSet(index2, 0);
HuWinMesMaxSizeGet(1, size, mess); HuWinMesMaxSizeGet(1, size, mess);
@ -649,7 +649,7 @@ typedef struct e3_char_sel_work {
s16 currPlayer; s16 currPlayer;
} E3CharSelWork; } E3CharSelWork;
static Vector2 charPosTbl[] = { static Vec2f charPosTbl[] = {
85, 248, 85, 248,
143, 248, 143, 248,
201, 248, 201, 248,
@ -1131,7 +1131,7 @@ typedef struct e3_rumble_cfg_work {
AnimData *frame[3]; AnimData *frame[3];
AnimData *arrow; AnimData *arrow;
AnimData *arrowHilite; AnimData *arrowHilite;
Vector2 winSize; Vec2f winSize;
s16 frameGroup; s16 frameGroup;
s16 arrowGroupL; s16 arrowGroupL;
s16 arrowGroupR; s16 arrowGroupR;
@ -1231,8 +1231,8 @@ static void InitRumbleCfg(omObjData *object)
s32 index; s32 index;
AnimData *anim; AnimData *anim;
u32 mess; u32 mess;
float sizeMax[2]; //FIXME: Change to Vector2 float sizeMax[2]; //FIXME: Change to Vec2f
float size[2]; //FIXME: Change to Vector2 float size[2]; //FIXME: Change to Vec2f
omSetStatBit(object, 0x100); omSetStatBit(object, 0x100);
object->data = HuMemDirectMallocNum(HEAP_SYSTEM, sizeof(E3RumbleCfgWork), MEMORY_DEFAULT_NUM); object->data = HuMemDirectMallocNum(HEAP_SYSTEM, sizeof(E3RumbleCfgWork), MEMORY_DEFAULT_NUM);
@ -1295,7 +1295,7 @@ static void InitRumbleCfg(omObjData *object)
HuWinMesMaxSizeGet(2, sizeMax, 0x220007, 0x220008); HuWinMesMaxSizeGet(2, sizeMax, 0x220007, 0x220008);
index2 = HuWinCreate(-10000, 299, sizeMax[0], sizeMax[1], 0); index2 = HuWinCreate(-10000, 299, sizeMax[0], sizeMax[1], 0);
work->winValue = index2; work->winValue = index2;
work->winSize = *(Vector2 *)(sizeMax); //FIXME: Remove Cast work->winSize = *(Vec2f *)(sizeMax); //FIXME: Remove Cast
HuWinBGTPLvlSet(index2, 0); HuWinBGTPLvlSet(index2, 0);
HuWinMesSpeedSet(index2, 0); HuWinMesSpeedSet(index2, 0);
HuWinMesMaxSizeGet(1, size, mess); HuWinMesMaxSizeGet(1, size, mess);
@ -1310,8 +1310,8 @@ static void InitRumbleCfg(omObjData *object)
typedef struct e3_mode_sel_work { typedef struct e3_mode_sel_work {
AnimData *frame[7]; AnimData *frame[7];
Vector2 winSizeMode; Vec2f winSizeMode;
Vector2 winSizeBoard; Vec2f winSizeBoard;
s16 frameGroup; s16 frameGroup;
s16 arrowGroupL; s16 arrowGroupL;
s16 arrowGroupR; s16 arrowGroupR;
@ -1325,12 +1325,12 @@ typedef struct e3_mode_sel_work {
s16 boardOld; s16 boardOld;
} E3ModeSelWork; } E3ModeSelWork;
static Vector2 modeSelCursorPosTbl[] = { static Vec2f modeSelCursorPosTbl[] = {
144, 418, 144, 418,
288, 418 288, 418
}; };
static Vector2 boardSelCursorPosTbl[] = { static Vec2f boardSelCursorPosTbl[] = {
94, 418, 94, 418,
284, 418 284, 418
}; };
@ -1459,7 +1459,7 @@ static void InitModeSel(omObjData *object)
s32 index; s32 index;
s16 group; s16 group;
AnimData *anim; AnimData *anim;
float size[2]; //FIXME: Change to Vector2 float size[2]; //FIXME: Change to Vec2f
omSetStatBit(object, 0x100); omSetStatBit(object, 0x100);
object->data = HuMemDirectMallocNum(HEAP_SYSTEM, sizeof(E3ModeSelWork), MEMORY_DEFAULT_NUM); object->data = HuMemDirectMallocNum(HEAP_SYSTEM, sizeof(E3ModeSelWork), MEMORY_DEFAULT_NUM);
@ -1536,7 +1536,7 @@ static void InitModeSel(omObjData *object)
#define E3_BG_MAX_TILE (E3_BG_TILE_COL*E3_BG_TILE_ROW) #define E3_BG_MAX_TILE (E3_BG_TILE_COL*E3_BG_TILE_ROW)
typedef struct e3_bg_tile { typedef struct e3_bg_tile {
Vector2 pos; Vec2f pos;
s16 sprite; s16 sprite;
} E3BGTile; } E3BGTile;