Game-Decompilation/2ship2harkinian
1
0
Fork 0
mirror of https://github.com/HarbourMasters/2ship2harkinian.git synced 2024-11-27 00:00:32 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

fix skybox textures not reloading (#719)

Browse Source
This commit is contained in:
Archez 2024-06-26 17:45:50 -04:00 committed by GitHub
parent 60673fac35
commit 03a33628cb
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 102 additions and 91 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
mm/include/z64skybox.h
View File

@ -23,7 +23,7 @@ typedef enum SkyboxId {
typedef struct SkyboxContext {
/* 0x000 */ View view;
/* 0x168 */ void* staticSegments[2][5];
/* 0x168 */ void* staticSegments[2][6]; // 2S2H [Port] Changed to hold enough pointers to OTR resources
/* 0x178 */ void* paletteStaticSegment;
/* 0x17C */ Gfx (*dListBuf)[150];
/* 0x180 */ Gfx* roomDL;
@ -41,33 +41,6 @@ typedef struct SkyboxContext {
/* 0x225 */ Color_RGB8 env;
} SkyboxContext; // size = 0x228
typedef struct {
char** file;
char* palette;
} SkyboxFiles;
#if 0
typedef struct SkyboxContext {
/* 0x000 */ View view;
/* 0x168 */ void* staticSegments[4];
/* 0x178 */ void* paletteStaticSegment;
/* 0x17C */ Gfx (*dListBuf)[150];
/* 0x180 */ Gfx* roomDL;
/* 0x184 */ Vtx* roomVtx;
/* 0x188 */ DmaRequest unk188;
/* 0x1A8 */ DmaRequest unk1A8;
/* 0x1C8 */ DmaRequest unk1C8;
/* 0x1E8 */ OSMesgQueue loadQueue;
/* 0x200 */ OSMesg loadMsg;
/* 0x204 */ s16 skyboxShouldDraw;
/* 0x208 */ Vec3f rot;
/* 0x214 */ Vec3f eye;
/* 0x220 */ s16 angle;
/* 0x222 */ Color_RGB8 prim;
/* 0x225 */ Color_RGB8 env;
} SkyboxContext; // size = 0x228
#endif
typedef struct struct_801C5F44 {
/* 0x00 */ s32 unk0;
/* 0x04 */ s32 unk4;
@ -88,4 +61,13 @@ void Skybox_Draw(SkyboxContext* skyboxCtx, struct GraphicsContext* gfxCtx, s16 s
f32 z);
void Skybox_Update(SkyboxContext* skyboxCtx);
// #region 2S2H [Port]
typedef enum SkyboxTexturesIndex {
/* 0 */ SKYBOX_TEXTURES_FINE,
/* 1 */ SKYBOX_TEXTURES_CLOUD,
} SkyboxTexturesIndex;
extern TexturePtr sSkyboxTextures[2][6];
// #endregion
#endif

38
mm/src/code/z_kankyo.c
View File

@ -1049,28 +1049,44 @@ void Environment_UpdateSkybox(u8 skyboxId, EnvironmentContext* envCtx, SkyboxCon
if ((envCtx->skybox1Index != skybox1Index) && (envCtx->skyboxDmaState == SKYBOX_DMA_INACTIVE)) {
envCtx->skyboxDmaState = SKYBOX_DMA_TEXTURE1_START;
size = sNormalSkyFiles[skybox1Index].file.vromEnd - sNormalSkyFiles[skybox1Index].file.vromStart;
osCreateMesgQueue(&envCtx->loadQueue, envCtx->loadMsg, ARRAY_COUNT(envCtx->loadMsg));
DmaMgr_SendRequestImpl(&envCtx->dmaRequest, skyboxCtx->staticSegments[0],
sNormalSkyFiles[skybox1Index].file.vromStart, size, 0, &envCtx->loadQueue,
OS_MESG_PTR(NULL));
// size = sNormalSkyFiles[skybox1Index].file.vromEnd - sNormalSkyFiles[skybox1Index].file.vromStart;
// osCreateMesgQueue(&envCtx->loadQueue, envCtx->loadMsg, ARRAY_COUNT(envCtx->loadMsg));
// DmaMgr_SendRequestImpl(&envCtx->dmaRequest, skyboxCtx->staticSegments[0],
// sNormalSkyFiles[skybox1Index].file.vromStart, size, 0, &envCtx->loadQueue,
// OS_MESG_PTR(NULL));
// 2S2h [Port] Bypass DMA request and assign each skybox texture directly to the static segment
for (size_t i = 0; i < ARRAY_COUNTU(skyboxCtx->staticSegments[0]); i++) {
skyboxCtx->staticSegments[0][i] = sSkyboxTextures[skybox1Index][i];
}
envCtx->skybox1Index = skybox1Index;
}
if ((envCtx->skybox2Index != skybox2Index) && (envCtx->skyboxDmaState == SKYBOX_DMA_INACTIVE)) {
envCtx->skyboxDmaState = SKYBOX_DMA_TEXTURE2_START;
size = sNormalSkyFiles[skybox2Index].file.vromEnd - sNormalSkyFiles[skybox2Index].file.vromStart;
osCreateMesgQueue(&envCtx->loadQueue, envCtx->loadMsg, ARRAY_COUNT(envCtx->loadMsg));
DmaMgr_SendRequestImpl(&envCtx->dmaRequest, skyboxCtx->staticSegments[1],
sNormalSkyFiles[skybox2Index].file.vromStart, size, 0, &envCtx->loadQueue,
OS_MESG_PTR(NULL));
// size = sNormalSkyFiles[skybox2Index].file.vromEnd - sNormalSkyFiles[skybox2Index].file.vromStart;
// osCreateMesgQueue(&envCtx->loadQueue, envCtx->loadMsg, ARRAY_COUNT(envCtx->loadMsg));
// DmaMgr_SendRequestImpl(&envCtx->dmaRequest, skyboxCtx->staticSegments[1],
// sNormalSkyFiles[skybox2Index].file.vromStart, size, 0, &envCtx->loadQueue,
// OS_MESG_PTR(NULL));
for (size_t i = 0; i < ARRAY_COUNTU(skyboxCtx->staticSegments[1]); i++) {
skyboxCtx->staticSegments[1][i] = sSkyboxTextures[skybox2Index][i];
}
envCtx->skybox2Index = skybox2Index;
}
if ((envCtx->skyboxDmaState == SKYBOX_DMA_TEXTURE1_START) ||
(envCtx->skyboxDmaState == SKYBOX_DMA_TEXTURE2_START)) {
if (osRecvMesg(&envCtx->loadQueue, NULL, 0) == 0) {
// if (osRecvMesg(&envCtx->loadQueue, NULL, 0) == 0) {
if (true) {
envCtx->skyboxDmaState = SKYBOX_DMA_INACTIVE;
// 2S2H [Port] Since the skybox static segments point to OTR strings, we need to re-create the skybox
// display lists to have the new textures loaded
func_80143148(skyboxCtx, 5);
// #endregion
}
}

117
mm/src/code/z_vr_box.c
View File

@ -3,6 +3,7 @@
#include "assets/misc/skyboxes/d2_cloud_static.h"
#include "assets/misc/skyboxes/d2_fine_static.h"
#include "assets/misc/skyboxes/d2_fine_pal_static.h"
#include "assets/2s2h_assets.h"
u32 D_801C5E30[] = { 0, 0x2000, 0x4000, 0x6000, 0x8000, 0xC000 };
@ -21,18 +22,14 @@ s16 D_801C5EC4[] = {
24, 7, 29, 28, 25, 26, 30, 10, 26, 27, 11, 30, 27, 28, 31, 11, 28, 29, 15, 31,
};
const char* sD2FineStaticTex[] = {
gClearSkybox1Tex, gClearSkybox2Tex, gClearSkybox3Tex, gClearSkybox4Tex, gClearSkybox5Tex,
};
const char* sD2CloudStaticTex[] = {
gCloudySkybox1Tex, gCloudySkybox2Tex, gCloudySkybox3Tex, gCloudySkybox4Tex, gCloudySkybox5Tex,
};
SkyboxFiles skyboxFiles[] = {
// 2S2H [Port] Renamed from files because of conflcit
{ sD2FineStaticTex, gClearSkyboxTlue },
{ sD2CloudStaticTex, gClearSkyboxTlue },
// 2S2H [Port] Skybox textures for our resource manager.
// The last texture is repeated for the top and bottom skybox faces.
TexturePtr sSkyboxTextures[2][6] = {
// d2_fine_static
{ gClearSkybox1Tex, gClearSkybox2Tex, gClearSkybox3Tex, gClearSkybox4Tex, gClearSkybox5Tex, gClearSkybox5Tex },
// d2_cloud_static
{ gCloudySkybox1Tex, gCloudySkybox2Tex, gCloudySkybox3Tex, gCloudySkybox4Tex, gCloudySkybox5Tex,
gCloudySkybox5Tex },
};
s32 func_80142440(SkyboxContext* skyboxCtx, Vtx* roomVtx, s32 arg2, s32 arg3, s32 arg4, s32 arg5, s32 arg6, s32 arg7,
@ -221,25 +218,29 @@ void Skybox_Setup(GameState* gameState, SkyboxContext* skyboxCtx, s16 skyboxId)
// size = SEGMENT_ROM_SIZE(d2_cloud_static);
// segment = (void*)ALIGN8((uintptr_t)skyboxCtx->staticSegments[0] + size);
// DmaMgr_SendRequest0(skyboxCtx->staticSegments[0], SEGMENT_ROM_START(d2_cloud_static), size);
for (size_t i = 0; i < ARRAY_COUNTU(sD2FineStaticTex); i++) {
skyboxCtx->staticSegments[0][i] = sD2FineStaticTex[i];
// 2S2h [Port] Bypass DMA request and assign each skybox texture directly to the static segment
for (size_t i = 0; i < ARRAY_COUNTU(skyboxCtx->staticSegments[0]); i++) {
skyboxCtx->staticSegments[0][i] = sSkyboxTextures[SKYBOX_TEXTURES_CLOUD][i];
}
for (size_t i = 0; i < ARRAY_COUNTU(sD2FineStaticTex); i++) {
skyboxCtx->staticSegments[1][i] = sD2CloudStaticTex[i];
}
skyboxCtx->paletteStaticSegment = gClearSkyboxTlue;
// Send a DMA request for the clear sky texture
// skyboxCtx->staticSegments[1] = segment;
// size = SEGMENT_ROM_SIZE(d2_fine_static);
// segment = (void*)ALIGN8((uintptr_t)segment + size);
// DmaMgr_SendRequest0(skyboxCtx->staticSegments[1], SEGMENT_ROM_START(d2_fine_static), size);
for (size_t i = 0; i < ARRAY_COUNTU(skyboxCtx->staticSegments[1]); i++) {
skyboxCtx->staticSegments[1][i] = sSkyboxTextures[SKYBOX_TEXTURES_FINE][i];
}
// Send a DMA request for the skybox palette
// skyboxCtx->paletteStaticSegment = segment;
// size = SEGMENT_ROM_SIZE(d2_fine_pal_static);
// segment = (void*)ALIGN8((uintptr_t)segment + size);
// ResourceMgr_LoadTexOrDListByName(gClearSkyboxTlue);
////DmaMgr_SendRequest0(skyboxCtx->paletteStaticSegment, SEGMENT_ROM_START(d2_fine_pal_static), size);
// DmaMgr_SendRequest0(skyboxCtx->paletteStaticSegment, SEGMENT_ROM_START(d2_fine_pal_static), size);
skyboxCtx->paletteStaticSegment = gClearSkyboxTlue;
// #endregion
skyboxCtx->prim.r = 145;
skyboxCtx->prim.g = 120;
@ -256,17 +257,18 @@ void Skybox_Setup(GameState* gameState, SkyboxContext* skyboxCtx, s16 skyboxId)
break;
case SKYBOX_2:
// BENTODO: in the original code, this case does nothing
// however this causes skyboxCtx->staticSegments to be 0 which in turn causes
// the draw calls in func_80142440 to crash because of the texture address ends up being 0
// I'm not sure if this is a mm bug or a 2s2h bug
for (size_t i = 0; i < ARRAY_COUNTU(sD2FineStaticTex); i++) {
skyboxCtx->staticSegments[0][i] = sD2FineStaticTex[i];
// #region 2S2H [Port] In the original code, this case does nothing
// however because we changed skyboxCtx->staticSegments to be pointers to OTR strings
// the draw calls in func_80142440 will crash because NULL being passed to the renderer.
// Here we set the segments to point to the empty texture to prevent the crash
for (size_t i = 0; i < ARRAY_COUNTU(skyboxCtx->staticSegments[0]); i++) {
skyboxCtx->staticSegments[0][i] = gEmptyTexture;
}
for (size_t i = 0; i < ARRAY_COUNTU(sD2FineStaticTex); i++) {
skyboxCtx->staticSegments[1][i] = sD2CloudStaticTex[i];
for (size_t i = 0; i < ARRAY_COUNTU(skyboxCtx->staticSegments[1]); i++) {
skyboxCtx->staticSegments[1][i] = gEmptyTexture;
}
skyboxCtx->paletteStaticSegment = gClearSkyboxTlue;
skyboxCtx->paletteStaticSegment = gEmptyTexture;
// #endregion
break;
default:
@ -282,59 +284,70 @@ void func_80143324(PlayState* play, SkyboxContext* skyboxCtx, s16 skyboxId) {
osCreateMesgQueue(&skyboxCtx->loadQueue, &skyboxCtx->loadMsg, 1);
if (play->envCtx.skybox1Index == 0) {
for (size_t i = 0; i < ARRAY_COUNTU(sD2FineStaticTex); i++) {
skyboxCtx->staticSegments[0][i] = sD2FineStaticTex[i];
}
//// Send a DMA request for the clear sky texture
// Send a DMA request for the clear sky texture
// size = SEGMENT_ROM_SIZE(d2_fine_static);
//
// DmaMgr_SendRequestImpl(&skyboxCtx->unk188, skyboxCtx->staticSegments[0],
// SEGMENT_ROM_START(d2_fine_static), size, 0, &skyboxCtx->loadQueue, NULL);
} else {
for (size_t i = 0; i < ARRAY_COUNTU(sD2FineStaticTex); i++) {
skyboxCtx->staticSegments[0][i] = sD2CloudStaticTex[i];
// 2S2h [Port] Bypass DMA request and assign each skybox texture directly to the static segment
for (size_t i = 0; i < ARRAY_COUNTU(skyboxCtx->staticSegments[0]); i++) {
skyboxCtx->staticSegments[0][i] = sSkyboxTextures[SKYBOX_TEXTURES_FINE][i];
}
//// Send a DMA request for the cloudy sky texture
} else {
// Send a DMA request for the cloudy sky texture
// size = SEGMENT_ROM_SIZE(d2_cloud_static);
//
// DmaMgr_SendRequestImpl(&skyboxCtx->unk188, skyboxCtx->staticSegments[0],
// SEGMENT_ROM_START(d2_cloud_static), size, 0, &skyboxCtx->loadQueue, NULL);
for (size_t i = 0; i < ARRAY_COUNTU(skyboxCtx->staticSegments[0]); i++) {
skyboxCtx->staticSegments[0][i] = sSkyboxTextures[SKYBOX_TEXTURES_CLOUD][i];
}
}
osRecvMesg(&skyboxCtx->loadQueue, NULL, OS_MESG_BLOCK);
osCreateMesgQueue(&skyboxCtx->loadQueue, &skyboxCtx->loadMsg, 1);
if (play->envCtx.skybox2Index == 0) {
for (size_t i = 0; i < ARRAY_COUNTU(sD2FineStaticTex); i++) {
skyboxCtx->staticSegments[1][i] = sD2FineStaticTex[i];
}
// Send a DMA request for the clear sky texture
// size = SEGMENT_ROM_SIZE(d2_fine_static);
//
// DmaMgr_SendRequestImpl(&skyboxCtx->unk1A8, skyboxCtx->staticSegments[1],
// SEGMENT_ROM_START(d2_fine_static), size, 0, &skyboxCtx->loadQueue, NULL);
} else {
for (size_t i = 0; i < ARRAY_COUNTU(sD2FineStaticTex); i++) {
skyboxCtx->staticSegments[1][i] = sD2CloudStaticTex[i];
for (size_t i = 0; i < ARRAY_COUNTU(skyboxCtx->staticSegments[1]); i++) {
skyboxCtx->staticSegments[1][i] = sSkyboxTextures[SKYBOX_TEXTURES_FINE][i];
}
} else {
// Send a DMA request for the cloudy sky texture
// size = SEGMENT_ROM_SIZE(d2_cloud_static);
//
// DmaMgr_SendRequestImpl(&skyboxCtx->unk1A8, skyboxCtx->staticSegments[1],
// SEGMENT_ROM_START(d2_cloud_static), size, 0, &skyboxCtx->loadQueue, NULL);
for (size_t i = 0; i < ARRAY_COUNTU(skyboxCtx->staticSegments[1]); i++) {
skyboxCtx->staticSegments[1][i] = sSkyboxTextures[SKYBOX_TEXTURES_CLOUD][i];
}
}
osRecvMesg(&skyboxCtx->loadQueue, NULL, OS_MESG_BLOCK);
osCreateMesgQueue(&skyboxCtx->loadQueue, &skyboxCtx->loadMsg, 1);
skyboxCtx->paletteStaticSegment = gClearSkyboxTlue;
// size = SEGMENT_ROM_SIZE(d2_fine_pal_static);
//
//// Send a DMA request for the skybox palette
// Send a DMA request for the skybox palette
// DmaMgr_SendRequestImpl(&skyboxCtx->unk1C8, skyboxCtx->paletteStaticSegment,
// SEGMENT_ROM_START(d2_fine_pal_static), size, 0, &skyboxCtx->loadQueue, NULL);
//
// osRecvMesg(&skyboxCtx->loadQueue, NULL, OS_MESG_BLOCK);
osRecvMesg(&skyboxCtx->loadQueue, NULL, OS_MESG_BLOCK);
skyboxCtx->paletteStaticSegment = gClearSkyboxTlue;
// 2S2H [Port] Since the skybox static segments point to OTR strings, we need to re-create the skybox
// display lists to have the new textures loaded
func_80143148(skyboxCtx, 5);
// #endregion
break;