mirror of
https://github.com/zeldaret/oot.git
synced 2024-11-14 05:19:36 +00:00
20c1f4e648
* First batch of files * Add missing folders back * Fix missing folders again * Finish fixing existing texture files * Gameplay_Keep XML finished * Most actor gameplay_keep undefined syms removed * Only ~200 gkeep symbols remain * All gkeep symbols that ZAP supports are fixed * Cleanup, and make gkeep names more accurate * Starting to figure out what some unknown blobs are, merge zeldaret in * fix a few more things * refactor gkeep * Change how gitkeep is handled * gkeep xml cleanup * Gkeep finished, now just waiting up ZAP updates * 100 link animations finished * 150 link animations finished * 200 link animations finished * 250 link animations finished * 350 link animations finished * 400 link animations finished * 450 link animations finished * 500 link animations finished * 550 link animations finished * All Link animations finished cannot build yet because ZAP doesn't have LinkAnimationHeader yet * xml changes for new zap stuff * finish gameplay_keep * fixing existing objects * ready for pr besides zap padding issue * mostly ready for pr * format all c files * all conflicts fixed * make changes that roman requested * fix thing i didn't mean to change * some animation symbols renamed * fixed roman's stuff * lifemeter hardcoded pointers removed * fix issue with incorrect data in gameplay_keep * removed unused asm * fixed most of fig's comments * fix all of fig's comments * reformat files * Update assets/xml/textures/icon_item_static.xml Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * Update assets/xml/textures/icon_item_static.xml Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * fixed stuff * fixed most of roman's comments * remove leading zeroes * should build now * git subrepo pull --force tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "f84d8337b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "f84d8337b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * all of gkeep symbols fixed * compiler error fixed * format files * final changes Co-authored-by: Zelllll <elijah@DESKTOP-NMP1I89.localdomain> Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
108 lines
4.5 KiB
C
108 lines
4.5 KiB
C
#include "global.h"
|
|
#include "objects/gameplay_keep/gameplay_keep.h"
|
|
|
|
typedef struct {
|
|
/* 0x00 */ s16 drawType; // indicates which draw function to use when displaying the object
|
|
/* 0x04 */ u32 drawArg; // segment address (display list or texture) passed to the draw funciton when called
|
|
} DebugDispObjectInfo; // size = 0x8
|
|
|
|
typedef void (*DebugDispObject_DrawFunc)(DebugDispObject*, u32, GlobalContext*);
|
|
|
|
void DebugDisplay_DrawSpriteI8(DebugDispObject* dispObj, u32 texture, GlobalContext* globalCtx);
|
|
void DebugDisplay_DrawPolygon(DebugDispObject* dispObj, u32 dlist, GlobalContext* globalCtx);
|
|
|
|
static DebugDispObject_DrawFunc sDebugObjectDrawFuncTable[] = {
|
|
DebugDisplay_DrawSpriteI8,
|
|
DebugDisplay_DrawPolygon,
|
|
};
|
|
|
|
static DebugDispObjectInfo sDebugObjectInfoTable[] = {
|
|
{ 0, gDebugCircleTex }, { 0, gDebugCrossTex }, { 0, gDebugBallTex },
|
|
{ 0, gDebugCursorTex }, { 1, gDebugArrowDL }, { 1, gDebugCameraDL },
|
|
};
|
|
|
|
static Lights1 sDebugObjectLights = gdSPDefLights1(0x80, 0x80, 0x80, 0xFF, 0xFF, 0xFF, 0x49, 0x49, 0x49);
|
|
|
|
static DebugDispObject* sDebugObjectListHead;
|
|
|
|
void DebugDisplay_Init(void) {
|
|
sDebugObjectListHead = NULL;
|
|
}
|
|
|
|
DebugDispObject* DebugDisplay_AddObject(f32 posX, f32 posY, f32 posZ, s16 rotX, s16 rotY, s16 rotZ, f32 scaleX,
|
|
f32 scaleY, f32 scaleZ, u8 red, u8 green, u8 blue, u8 alpha, s16 type,
|
|
GraphicsContext* gfxCtx) {
|
|
DebugDispObject* prevHead = sDebugObjectListHead;
|
|
|
|
sDebugObjectListHead = Graph_Alloc(gfxCtx, sizeof(DebugDispObject));
|
|
|
|
sDebugObjectListHead->pos.x = posX;
|
|
sDebugObjectListHead->pos.y = posY;
|
|
sDebugObjectListHead->pos.z = posZ;
|
|
sDebugObjectListHead->rot.x = rotX;
|
|
sDebugObjectListHead->rot.y = rotY;
|
|
sDebugObjectListHead->rot.z = rotZ;
|
|
sDebugObjectListHead->scale.x = scaleX;
|
|
sDebugObjectListHead->scale.y = scaleY;
|
|
sDebugObjectListHead->scale.z = scaleZ;
|
|
sDebugObjectListHead->color.r = red;
|
|
sDebugObjectListHead->color.g = green;
|
|
sDebugObjectListHead->color.b = blue;
|
|
sDebugObjectListHead->color.a = alpha;
|
|
sDebugObjectListHead->type = type;
|
|
sDebugObjectListHead->next = prevHead;
|
|
|
|
return sDebugObjectListHead;
|
|
}
|
|
|
|
void DebugDisplay_DrawObjects(GlobalContext* globalCtx) {
|
|
DebugDispObject* dispObj = sDebugObjectListHead;
|
|
DebugDispObjectInfo* objInfo;
|
|
|
|
while (dispObj != NULL) {
|
|
objInfo = &sDebugObjectInfoTable[dispObj->type];
|
|
sDebugObjectDrawFuncTable[objInfo->drawType](dispObj, objInfo->drawArg, globalCtx);
|
|
dispObj = dispObj->next;
|
|
}
|
|
}
|
|
|
|
void DebugDisplay_DrawSpriteI8(DebugDispObject* dispObj, u32 texture, GlobalContext* globalCtx) {
|
|
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_debug_display.c", 169);
|
|
|
|
func_80094678(globalCtx->state.gfxCtx);
|
|
|
|
gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, dispObj->color.r, dispObj->color.g, dispObj->color.b, dispObj->color.a);
|
|
|
|
Matrix_Translate(dispObj->pos.x, dispObj->pos.y, dispObj->pos.z, MTXMODE_NEW);
|
|
Matrix_Scale(dispObj->scale.x, dispObj->scale.y, dispObj->scale.z, MTXMODE_APPLY);
|
|
Matrix_Mult(&globalCtx->mf_11DA0, MTXMODE_APPLY);
|
|
Matrix_RotateRPY(dispObj->rot.x, dispObj->rot.y, dispObj->rot.z, MTXMODE_APPLY);
|
|
|
|
gDPLoadTextureBlock(POLY_XLU_DISP++, texture, G_IM_FMT_I, G_IM_SIZ_8b, 16, 16, 0, G_TX_NOMIRROR | G_TX_WRAP,
|
|
G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD);
|
|
|
|
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_debug_display.c", 189),
|
|
G_MTX_MODELVIEW | G_MTX_LOAD);
|
|
gSPDisplayList(POLY_XLU_DISP++, &gDebugSpriteDL);
|
|
|
|
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_debug_display.c", 192);
|
|
}
|
|
|
|
void DebugDisplay_DrawPolygon(DebugDispObject* dispObj, u32 dlist, GlobalContext* globalCtx) {
|
|
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_debug_display.c", 211);
|
|
|
|
func_8009435C(globalCtx->state.gfxCtx);
|
|
|
|
gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, dispObj->color.r, dispObj->color.g, dispObj->color.b, dispObj->color.a);
|
|
|
|
gSPSetLights1(POLY_XLU_DISP++, sDebugObjectLights);
|
|
|
|
func_800D1694(dispObj->pos.x, dispObj->pos.y, dispObj->pos.z, &dispObj->rot);
|
|
Matrix_Scale(dispObj->scale.x, dispObj->scale.y, dispObj->scale.z, MTXMODE_APPLY);
|
|
|
|
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_debug_display.c", 228),
|
|
G_MTX_MODELVIEW | G_MTX_LOAD);
|
|
gSPDisplayList(POLY_XLU_DISP++, dlist);
|
|
|
|
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_debug_display.c", 231);
|
|
}
|