mirror of
https://github.com/HarbourMasters/Shipwright.git
synced 2024-11-11 12:05:09 -05:00
0f7a88bd5a
* This should fix (all?) 60fps interpolation issues left. Resolves #631 #917 * Update z_fishing.c * Re-adds Emil's interpolation in certain places. * move open/close disps out of if statments checking timer based vars, revert fishing to use recordopen/closed child * move disps out of ifs for morpha * use recordopen/recordclose for volv * recordopen/recordclose for ganondorf * switch back to recordopen/recordclose for ganondorf floor * Frame interpolation now uses a 64bit parameter rather than 32. * More 60fps fixes * Fix close child typo * add todo calls to recordopen/recordclose * fix build * revert long long frame interpolation * add some epochs * add more epochs * bongo epochs * the rest of the epochs * fix the typo fix the build * interpolation fixes pr cleanup * init/cleanup bongo epochs * bongo hand trails * Fixes niw feathers * Fixes bongo bongo hands, and replaces epoch * i with epoch + i * don't update epochs Co-authored-by: briaguya <briaguya@alice>
212 lines
7.1 KiB
C
212 lines
7.1 KiB
C
#include "global.h"
|
|
#include "vt.h"
|
|
|
|
volatile OSTime D_8016A520;
|
|
volatile OSTime D_8016A528;
|
|
volatile OSTime D_8016A530;
|
|
volatile OSTime D_8016A538;
|
|
volatile OSTime D_8016A540;
|
|
volatile OSTime D_8016A548;
|
|
volatile OSTime D_8016A550;
|
|
volatile OSTime D_8016A558;
|
|
volatile OSTime gRSPAudioTotalTime;
|
|
volatile OSTime gRSPGFXTotalTime;
|
|
volatile OSTime gRSPOtherTotalTime;
|
|
volatile OSTime D_8016A578;
|
|
volatile OSTime gRDPTotalTime;
|
|
SpeedMeterTimeEntry* sSpeedMeterTimeEntryPtr;
|
|
|
|
SpeedMeterTimeEntry sSpeedMeterTimeEntryArray[] = {
|
|
{ &D_8016A520, 0, 0, GPACK_RGBA5551(255, 0, 0, 1) }, { &D_8016A528, 0, 2, GPACK_RGBA5551(255, 255, 0, 1) },
|
|
{ &D_8016A530, 0, 4, GPACK_RGBA5551(0, 0, 255, 1) }, { &D_8016A538, 0, 6, GPACK_RGBA5551(255, 128, 128, 1) },
|
|
{ &D_8016A540, 0, 8, GPACK_RGBA5551(0, 255, 0, 1) }, { &D_8016A548, 0, 10, GPACK_RGBA5551(255, 0, 255, 1) },
|
|
};
|
|
|
|
#define DrawRec(gfx, color, ulx, uly, lrx, lry) \
|
|
gDPPipeSync(gfx); \
|
|
gDPSetFillColor(gfx, ((color) << 16) | (color)); \
|
|
gDPFillRectangle(gfx, (ulx), (uly), (lrx), (lry)); \
|
|
gDPPipeSync(gfx);
|
|
|
|
void SpeedMeter_InitImpl(SpeedMeter* this, u32 arg1, u32 y) {
|
|
LOG_CHECK_NULL_POINTER("this", this);
|
|
this->unk_18 = arg1;
|
|
this->y = y;
|
|
}
|
|
|
|
void SpeedMeter_Init(SpeedMeter* this) {
|
|
SpeedMeter_InitImpl(this, 32, 22);
|
|
}
|
|
|
|
void SpeedMeter_Destroy(SpeedMeter* this) {
|
|
}
|
|
|
|
void SpeedMeter_DrawTimeEntries(SpeedMeter* this, GraphicsContext* gfxCtx) {
|
|
s32 pad[2];
|
|
u32 baseX = 32;
|
|
s32 temp;
|
|
s32 i;
|
|
s32 uly;
|
|
s32 lry;
|
|
View view;
|
|
u32 pad2[3];
|
|
Gfx* gfx;
|
|
|
|
uly = this->y;
|
|
lry = this->y + 2;
|
|
|
|
/*! @bug if gIrqMgrRetraceTime is 0, CLOSE_DISPS will never be reached */
|
|
if (gIrqMgrRetraceTime == 0) {
|
|
return;
|
|
}
|
|
|
|
OPEN_DISPS(gfxCtx);
|
|
|
|
sSpeedMeterTimeEntryPtr = &sSpeedMeterTimeEntryArray[0];
|
|
for (i = 0; i < ARRAY_COUNT(sSpeedMeterTimeEntryArray); i++) {
|
|
temp = ((f64) * (sSpeedMeterTimeEntryPtr->time) / gIrqMgrRetraceTime) * 64.0;
|
|
sSpeedMeterTimeEntryPtr->x = temp + baseX;
|
|
sSpeedMeterTimeEntryPtr++;
|
|
}
|
|
|
|
View_Init(&view, gfxCtx);
|
|
view.flags = 0xA;
|
|
|
|
SET_FULLSCREEN_VIEWPORT(&view);
|
|
|
|
gfx = OVERLAY_DISP;
|
|
func_800AB9EC(&view, 0xF, &gfx);
|
|
|
|
gDPPipeSync(gfx++);
|
|
gDPSetOtherMode(gfx++,
|
|
G_AD_PATTERN | G_CD_MAGICSQ | G_CK_NONE | G_TC_CONV | G_TF_POINT | G_TT_NONE | G_TL_TILE |
|
|
G_TD_CLAMP | G_TP_NONE | G_CYC_FILL | G_PM_NPRIMITIVE,
|
|
G_AC_NONE | G_ZS_PIXEL | G_RM_NOOP | G_RM_NOOP2);
|
|
|
|
DrawRec(gfx++, GPACK_RGBA5551(0, 0, 255, 1), baseX + 64 * 0, uly, baseX + 64 * 1, lry);
|
|
DrawRec(gfx++, GPACK_RGBA5551(0, 255, 0, 1), baseX + 64 * 1, uly, baseX + 64 * 2, lry);
|
|
DrawRec(gfx++, GPACK_RGBA5551(255, 0, 0, 1), baseX + 64 * 2, uly, baseX + 64 * 3, lry);
|
|
DrawRec(gfx++, GPACK_RGBA5551(255, 0, 255, 1), baseX + 64 * 3, uly, baseX + 64 * 4, lry);
|
|
|
|
sSpeedMeterTimeEntryPtr = &sSpeedMeterTimeEntryArray[0];
|
|
for (i = 0; i < ARRAY_COUNT(sSpeedMeterTimeEntryArray); i++) {
|
|
DrawRec(gfx++, sSpeedMeterTimeEntryPtr->color, baseX, lry + sSpeedMeterTimeEntryPtr->y,
|
|
sSpeedMeterTimeEntryPtr->x, lry + sSpeedMeterTimeEntryPtr->y + 1);
|
|
sSpeedMeterTimeEntryPtr++;
|
|
}
|
|
gDPPipeSync(gfx++);
|
|
|
|
OVERLAY_DISP = gfx;
|
|
|
|
CLOSE_DISPS(gfxCtx);
|
|
}
|
|
|
|
void SpeedMeter_InitAllocEntry(SpeedMeterAllocEntry* this, u32 maxval, u32 val, u16 backColor, u16 foreColor, u32 ulx,
|
|
u32 lrx, u32 uly, u32 lry) {
|
|
this->maxval = maxval;
|
|
this->val = val;
|
|
this->backColor = backColor;
|
|
this->foreColor = foreColor;
|
|
this->ulx = ulx;
|
|
this->lrx = lrx;
|
|
this->uly = uly;
|
|
this->lry = lry;
|
|
}
|
|
|
|
void SpeedMeter_DrawAllocEntry(SpeedMeterAllocEntry* this, GraphicsContext* gfxCtx) {
|
|
s32 usedOff;
|
|
View view;
|
|
Gfx* gfx;
|
|
|
|
if (this->maxval == 0) {
|
|
osSyncPrintf(VT_FGCOL(RED));
|
|
LOG_NUM("this->maxval", this->maxval);
|
|
osSyncPrintf(VT_RST);
|
|
} else {
|
|
OPEN_DISPS(gfxCtx);
|
|
|
|
View_Init(&view, gfxCtx);
|
|
view.flags = 0xA;
|
|
|
|
SET_FULLSCREEN_VIEWPORT(&view);
|
|
|
|
gfx = OVERLAY_DISP;
|
|
func_800AB9EC(&view, 0xF, &gfx);
|
|
|
|
gDPPipeSync(gfx++);
|
|
gDPSetOtherMode(gfx++,
|
|
G_AD_PATTERN | G_CD_MAGICSQ | G_CK_NONE | G_TC_CONV | G_TF_POINT | G_TT_NONE | G_TL_TILE |
|
|
G_TD_CLAMP | G_TP_NONE | G_CYC_FILL | G_PM_NPRIMITIVE,
|
|
G_AC_NONE | G_ZS_PIXEL | G_RM_NOOP | G_RM_NOOP2);
|
|
|
|
usedOff = ((this->lrx - this->ulx) * this->val) / this->maxval + this->ulx;
|
|
DrawRec(gfx++, this->backColor, usedOff, this->uly, this->lrx, this->lry);
|
|
DrawRec(gfx++, this->foreColor, this->ulx, this->uly, usedOff, this->lry);
|
|
|
|
gDPPipeSync(gfx++);
|
|
|
|
OVERLAY_DISP = gfx;
|
|
CLOSE_DISPS(gfxCtx);
|
|
}
|
|
}
|
|
|
|
void SpeedMeter_DrawAllocEntries(SpeedMeter* meter, GraphicsContext* gfxCtx, GameState* state) {
|
|
s32 pad[2];
|
|
u32 ulx = 30;
|
|
u32 lrx = 290;
|
|
SpeedMeterAllocEntry entry;
|
|
u32 temp;
|
|
s32 y;
|
|
TwoHeadGfxArena* thga;
|
|
u32 zeldaFreeMax;
|
|
u32 zeldaFree;
|
|
u32 zeldaAlloc;
|
|
s32 sysFreeMax;
|
|
s32 sysFree;
|
|
s32 sysAlloc;
|
|
|
|
y = 212;
|
|
if (SREG(0) > 2) {
|
|
if (ZeldaArena_IsInitalized()) {
|
|
ZeldaArena_GetSizes(&zeldaFreeMax, &zeldaFree, &zeldaAlloc);
|
|
SpeedMeter_InitAllocEntry(&entry, zeldaFree + zeldaAlloc, zeldaAlloc, GPACK_RGBA5551(0, 0, 255, 1),
|
|
GPACK_RGBA5551(255, 255, 255, 1), ulx, lrx, y, y + 1);
|
|
SpeedMeter_DrawAllocEntry(&entry, gfxCtx);
|
|
y++;
|
|
y++;
|
|
}
|
|
}
|
|
|
|
if (SREG(0) > 1) {
|
|
SystemArena_GetSizes((u32*)&sysFreeMax, (u32*)&sysFree, (u32*)&sysAlloc);
|
|
SpeedMeter_InitAllocEntry(&entry, sysFree + sysAlloc - state->tha.size, sysAlloc - state->tha.size,
|
|
GPACK_RGBA5551(0, 0, 255, 1), GPACK_RGBA5551(255, 128, 128, 1), ulx, lrx, y, y);
|
|
SpeedMeter_DrawAllocEntry(&entry, gfxCtx);
|
|
y++;
|
|
}
|
|
|
|
thga = (TwoHeadGfxArena*)&state->tha;
|
|
SpeedMeter_InitAllocEntry(&entry, thga->size, thga->size - THA_GetSize((TwoHeadArena*)thga),
|
|
GPACK_RGBA5551(0, 0, 255, 1), GPACK_RGBA5551(0, 255, 0, 1), ulx, lrx, y, y);
|
|
SpeedMeter_DrawAllocEntry(&entry, gfxCtx);
|
|
y++;
|
|
|
|
thga = &gfxCtx->polyOpa;
|
|
SpeedMeter_InitAllocEntry(&entry, thga->size, thga->size - THGA_GetSize(thga), GPACK_RGBA5551(0, 0, 255, 1),
|
|
GPACK_RGBA5551(255, 0, 255, 1), ulx, lrx, y, y);
|
|
SpeedMeter_DrawAllocEntry(&entry, gfxCtx);
|
|
y++;
|
|
|
|
thga = &gfxCtx->polyXlu;
|
|
SpeedMeter_InitAllocEntry(&entry, thga->size, thga->size - THGA_GetSize(thga), GPACK_RGBA5551(0, 0, 255, 1),
|
|
GPACK_RGBA5551(255, 255, 0, 1), ulx, lrx, y, y);
|
|
SpeedMeter_DrawAllocEntry(&entry, gfxCtx);
|
|
y++;
|
|
|
|
thga = &gfxCtx->overlay;
|
|
SpeedMeter_InitAllocEntry(&entry, thga->size, thga->size - THGA_GetSize(thga), GPACK_RGBA5551(0, 0, 255, 1),
|
|
GPACK_RGBA5551(255, 0, 0, 1), ulx, lrx, y, y);
|
|
SpeedMeter_DrawAllocEntry(&entry, gfxCtx);
|
|
y++;
|
|
}
|