mirror of
https://github.com/HarbourMasters/Shipwright.git
synced 2025-02-24 06:41:52 -05:00
a5df9dddf0
* First batch some overlay
* Almost all overlay
* effect & gamestate
* kaleido stuffs
* more overlay
* more left over from code folder
* remaining hardcoded line and file
* Open & Close _DISP __FILE__ & __LINE__ clean up
* Some if (1) {} remove
* LOG_xxxx __FILE__ , __LINE__ cleaned
* ASSERT macro __FILE__ __LINE__
* mtx without line/file in functions
* " if (1) {} " & "if (0) {}" and tab/white place
* LogUtils as macro
* GameState_, GameAlloc_, SystemArena_ & ZeldaArena_
* Revert "GameState_, GameAlloc_, SystemArena_ & ZeldaArena_"
This reverts commit 0d85caaf7e342648c01a15fe21e93637352dc596.
* Like last commit but as macro
* Fix matrix not using macros
* use function not macro
* DebugArena_* functions
GameAlloc_MallocDebug
BgCheck_PosErrorCheck as macros
removed issues with ; in macro file
97 lines
3.8 KiB
C
97 lines
3.8 KiB
C
#include "global.h"
|
|
|
|
#include "soh/frame_interpolation.h"
|
|
|
|
Mtx* sSkyboxDrawMatrix;
|
|
|
|
Mtx* SkyboxDraw_UpdateMatrix(SkyboxContext* skyboxCtx, f32 x, f32 y, f32 z) {
|
|
Matrix_Translate(x, y, z, MTXMODE_NEW);
|
|
Matrix_Scale(1.0f, 1.0f, 1.0f, MTXMODE_APPLY);
|
|
Matrix_RotateX(skyboxCtx->rot.x, MTXMODE_APPLY);
|
|
Matrix_RotateY(skyboxCtx->rot.y, MTXMODE_APPLY);
|
|
Matrix_RotateZ(skyboxCtx->rot.z, MTXMODE_APPLY);
|
|
return MATRIX_TOMTX(sSkyboxDrawMatrix);
|
|
}
|
|
|
|
void SkyboxDraw_Draw(SkyboxContext* skyboxCtx, GraphicsContext* gfxCtx, s16 skyboxId, s16 blend, f32 x, f32 y, f32 z) {
|
|
OPEN_DISPS(gfxCtx);
|
|
FrameInterpolation_RecordOpenChild(NULL, FrameInterpolation_GetCameraEpoch());
|
|
|
|
func_800945A0(gfxCtx);
|
|
|
|
//gsSPShaderTest(POLY_OPA_DISP++);
|
|
|
|
/*gSPSegment(POLY_OPA_DISP++, 0x7, skyboxCtx->staticSegments[0]);
|
|
gSPSegment(POLY_OPA_DISP++, 0x8, skyboxCtx->staticSegments[1]);
|
|
gSPSegment(POLY_OPA_DISP++, 0x9, skyboxCtx->palettes);*/
|
|
|
|
gDPSetPrimColor(POLY_OPA_DISP++, 0x00, 0x00, 0, 0, 0, blend);
|
|
gSPTexture(POLY_OPA_DISP++, 0x8000, 0x8000, 0, G_TX_RENDERTILE, G_ON);
|
|
|
|
sSkyboxDrawMatrix = Graph_Alloc(gfxCtx, sizeof(Mtx));
|
|
|
|
Matrix_Translate(x, y, z, MTXMODE_NEW);
|
|
Matrix_Scale(1.0f, 1.0f, 1.0f, MTXMODE_APPLY);
|
|
Matrix_RotateX(skyboxCtx->rot.x, MTXMODE_APPLY);
|
|
Matrix_RotateY(skyboxCtx->rot.y, MTXMODE_APPLY);
|
|
Matrix_RotateZ(skyboxCtx->rot.z, MTXMODE_APPLY);
|
|
MATRIX_TOMTX(sSkyboxDrawMatrix);
|
|
gSPMatrix(POLY_OPA_DISP++, sSkyboxDrawMatrix, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
|
|
|
|
gDPSetColorDither(POLY_OPA_DISP++, G_CD_MAGICSQ);
|
|
gDPSetTextureFilter(POLY_OPA_DISP++, G_TF_BILERP);
|
|
|
|
if (skyboxCtx->palette_size == 256) {
|
|
gDPLoadTLUT_pal256(POLY_OPA_DISP++, skyboxCtx->palettes[0]);
|
|
} else {
|
|
gDPLoadTLUT_pal128(POLY_OPA_DISP++, 0, skyboxCtx->palettes[0]);
|
|
gDPLoadTLUT_pal128(POLY_OPA_DISP++, 1, skyboxCtx->palettes[1]);
|
|
}
|
|
gDPSetTextureLUT(POLY_OPA_DISP++, G_TT_RGBA16);
|
|
gDPSetTextureConvert(POLY_OPA_DISP++, G_TC_FILT);
|
|
|
|
if (skyboxCtx->unk_140) {
|
|
gSPDisplayList(POLY_OPA_DISP++, skyboxCtx->dListBuf[0]);
|
|
gSPDisplayList(POLY_OPA_DISP++, skyboxCtx->dListBuf[1]);
|
|
|
|
gDPPipeSync(POLY_OPA_DISP++);
|
|
gDPLoadTLUT_pal256(POLY_OPA_DISP++, skyboxCtx->palettes[1]);
|
|
gSPDisplayList(POLY_OPA_DISP++, skyboxCtx->dListBuf[2]);
|
|
gSPDisplayList(POLY_OPA_DISP++, skyboxCtx->dListBuf[3]);
|
|
|
|
if (skyboxId != SKYBOX_BAZAAR) {
|
|
if (skyboxId <= SKYBOX_HOUSE_KAKARIKO || skyboxId > SKYBOX_BOMBCHU_SHOP) {
|
|
gDPPipeSync(POLY_OPA_DISP++);
|
|
gDPLoadTLUT_pal256(POLY_OPA_DISP++, skyboxCtx->palettes[2]);
|
|
gSPDisplayList(POLY_OPA_DISP++, skyboxCtx->dListBuf[4]);
|
|
gSPDisplayList(POLY_OPA_DISP++, skyboxCtx->dListBuf[5]);
|
|
|
|
gDPPipeSync(POLY_OPA_DISP++);
|
|
if (skyboxCtx->unk_140 != 2) {
|
|
gDPLoadTLUT_pal256(POLY_OPA_DISP++, skyboxCtx->palettes[3]);
|
|
gSPDisplayList(POLY_OPA_DISP++, skyboxCtx->dListBuf[6]);
|
|
gSPDisplayList(POLY_OPA_DISP++, skyboxCtx->dListBuf[7]);
|
|
}
|
|
}
|
|
}
|
|
} else {
|
|
gSPDisplayList(POLY_OPA_DISP++, skyboxCtx->dListBuf[0]);
|
|
gSPDisplayList(POLY_OPA_DISP++, skyboxCtx->dListBuf[2]);
|
|
gSPDisplayList(POLY_OPA_DISP++, skyboxCtx->dListBuf[4]);
|
|
gSPDisplayList(POLY_OPA_DISP++, skyboxCtx->dListBuf[6]);
|
|
gSPDisplayList(POLY_OPA_DISP++, skyboxCtx->dListBuf[8]);
|
|
if (skyboxId == SKYBOX_CUTSCENE_MAP) {
|
|
gSPDisplayList(POLY_OPA_DISP++, skyboxCtx->dListBuf[10]);
|
|
}
|
|
}
|
|
|
|
gDPPipeSync(POLY_OPA_DISP++);
|
|
//gsSPShaderTest2(POLY_OPA_DISP++);
|
|
|
|
FrameInterpolation_RecordCloseChild();
|
|
CLOSE_DISPS(gfxCtx);
|
|
}
|
|
|
|
void SkyboxDraw_Update(SkyboxContext* skyboxCtx) {
|
|
}
|