mirror/tww
1
0
Fork 0
mirror of https://github.com/zeldaret/tww.git synced 2026-06-24 00:51:29 -04:00
Code Issues Packages Projects Releases Wiki Activity

Clean up JPAEmitterLoader

Browse Source
This commit is contained in:
LagoLunatic
2025-03-06 19:15:49 -05:00
parent c6768dba61
commit 0e508ad721
2 changed files with 57 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/JSystem/JUtility/JUTDataHeader.h
+2 -2
View File
@@ -6,8 +6,8 @@
#include "global.h"
struct JUTDataBlockHeader {
/* 0x0 */ u32 mType;
/* 0x4 */ u32 mSize;
/* 0x00 */ u32 mType;
/* 0x04 */ u32 mSize;
const JUTDataBlockHeader* getNext() const { // fake inline
return reinterpret_cast<const JUTDataBlockHeader*>(reinterpret_cast<const u8*>(this) + mSize);
src/JSystem/JParticle/JPAEmitterLoader.cpp
+55 -35
View File
@@ -6,8 +6,6 @@
#include "JSystem/JParticle/JPAEmitterLoader.h"
#include "JSystem/JParticle/JPAEmitter.h"
#include "JSystem/JParticle/JPAResourceManager.h"
#include "JSystem/JUtility/JUTAssert.h"
#include "JSystem/JKernel/JKRHeap.h"
#include "JSystem/JParticle/JPADynamicsBlock.h"
#include "JSystem/JParticle/JPABaseShape.h"
@@ -17,6 +15,10 @@
#include "JSystem/JParticle/JPAKeyBlock.h"
#include "JSystem/JParticle/JPAFieldBlock.h"
#include "JSystem/JUtility/JUTAssert.h"
#include "JSystem/JUtility/JUTDataHeader.h"
#include "JSystem/JKernel/JKRHeap.h"
class JPAEmitterArchiveLoader_v10 {
public:
void load();
@@ -31,28 +33,26 @@ public:
};
static void dummy() {
OSReport("JPAEmitterLoader.cpp");
OSReport("%s");
OSReport("This is WRONG Version File\n");
OSReport("This is NO JPA File\n");
OSReport("pEmtrRes");
OSReport("Halt");
OSReport("pEmtrRes->pLinkInfoArray");
OSReport("pLinkInfo");
OSReport("pLinkInfo->keyBlocks || pLinkInfo->keyNum == 0");
OSReport("pLinkInfo->fldBlocks || pLinkInfo->fldNum == 0");
OSReport("pLinkInfo->texDataBase || texNum == 0");
OSReport("pLinkInfo->fldBlocks[fldCntr]");
OSReport("pLinkInfo->keyBlocks[keyCntr]");
OSReport("pLinkInfo->dynBlock");
OSReport("pLinkInfo->bspBlock");
OSReport("pLinkInfo->espBlock");
OSReport("pLinkInfo->sspBlock");
OSReport("pLinkInfo->etxBlock");
OSReport("This is WRONG File\n");
OSReport("pLinkInfo->fldBlocks[fld_cntr]");
OSReport("pLinkInfo->keyBlocks[key_cntr]");
OSReport("pTex");
JUT_WARN(0, "%s", "This is WRONG Version File\n");
JUT_WARN(0, "%s", "This is NO JPA File\n");
JPAEmitterData* pEmtrRes;
JUT_ASSERT(0, pEmtrRes);
JUT_ASSERT(0, pEmtrRes->pLinkInfoArray);
JPADataBlockLinkInfo* pLinkInfo;
JUT_ASSERT(0, pLinkInfo);
JUT_ASSERT(0, pLinkInfo->keyBlocks || pLinkInfo->keyNum == 0);
JUT_ASSERT(0, pLinkInfo->fldBlocks || pLinkInfo->fldNum == 0);
u32 texNum;
JUT_ASSERT(0, pLinkInfo->texDataBase || texNum == 0);
u32 fldCntr;
JUT_ASSERT(0, pLinkInfo->fldBlocks[fldCntr]);
u32 keyCntr;
JUT_ASSERT(0, pLinkInfo->keyBlocks[keyCntr]);
JUT_ASSERT(0, pLinkInfo->dynBlock);
JUT_ASSERT(0, pLinkInfo->bspBlock);
JUT_ASSERT(0, pLinkInfo->espBlock);
JUT_ASSERT(0, pLinkInfo->sspBlock);
JUT_ASSERT(0, pLinkInfo->etxBlock);
}
/* 802590B4-8025917C .text load__31JPAEmitterArchiveLoaderDataBaseFPCUcP7JKRHeapPP18JPAEmitterResourcePP18JPATextureResource */
@@ -85,6 +85,25 @@ struct JPAEmitterArchiveData_v10 {
/* 0x0A */ u16 texResNum;
};
struct JPAEmitterParticleHeader_v10 {
/* 0x00 */ u32 magic; // 'JEFF'
/* 0x04 */ u32 type; // 'jpa1'
/* 0x08 */ u8 field_0x08[0x0C - 0x08];
/* 0x0C */ u32 blockNum;
/* 0x10 */ u8 field_0x10[0x14 - 0x10];
/* 0x14 */ u8 keyNum;
/* 0x15 */ u8 fldNum;
/* 0x16 */ u8 textureNum;
/* 0x18 */ u16 resID;
};
struct JPAEmitterBlockHeader_v10 {
/* 0x00 */ u32 magic;
/* 0x04 */ u32 size;
/* 0x08 */ u8 field_0x08[0x0C - 0x08];
/* 0x0C */ u8 blockData;
};
/* 8025917C-8025991C .text load__27JPAEmitterArchiveLoader_v10Fv */
void JPAEmitterArchiveLoader_v10::load() {
const JPAEmitterArchiveData_v10* header = (const JPAEmitterArchiveData_v10*)pData;
@@ -93,7 +112,7 @@ void JPAEmitterArchiveLoader_v10::load() {
u32 offs = 0x20;
for (s32 i = 0; i < header->emtrResNum; i++) {
const u8* data = &pData[offs];
const JPAEmitterParticleHeader_v10* ptcl = (const JPAEmitterParticleHeader_v10*)&pData[offs];
JPAEmitterData* pEmtrRes = new(pHeap, 0) JPAEmitterData();
JUT_ASSERT(234, pEmtrRes);
@@ -106,25 +125,25 @@ void JPAEmitterArchiveLoader_v10::load() {
JUT_ASSERT(243, pEmtrRes->pLinkInfoArray);
pEmtrRes->pLinkInfoArray[0] = pLinkInfo;
pLinkInfo->keyNum = data[0x14];
pLinkInfo->keyNum = ptcl->keyNum;
pLinkInfo->keyBlocks = (JPAKeyBlock**) (pLinkInfo->keyNum != 0 ? new(pHeap, 0) JPAKeyBlockArc*[pLinkInfo->keyNum] : NULL);
JUT_ASSERT(250, pLinkInfo->keyBlocks || pLinkInfo->keyNum == 0);
pLinkInfo->fldNum = data[0x15];
pLinkInfo->fldNum = ptcl->fldNum;
pLinkInfo->fldBlocks = (JPAFieldBlock**) (pLinkInfo->fldNum != 0 ? new(pHeap, 0) JPAFieldBlockArc*[pLinkInfo->fldNum] : NULL);
JUT_ASSERT(256, pLinkInfo->fldBlocks || pLinkInfo->fldNum == 0);
pLinkInfo->mTextureNum = data[0x16];
pLinkInfo->mTextureNum = ptcl->textureNum;
pLinkInfo->texDataBase = NULL;
u32 fld_cntr = 0;
u32 key_cntr = 0;
u32 j = 0;
u32 blockOffs = offs + 0x20;
for (; j < *((u32*)(data + 0x0C)); j++) {
const u8* block = (const u8*)(pData + blockOffs);
u32 size = ((u32*)block)[1];
switch (((u32*)block)[0]) {
for (; j < ptcl->blockNum; j++) {
const JPAEmitterBlockHeader_v10* block = (const JPAEmitterBlockHeader_v10*)(pData + blockOffs);
u32 size = block->size;
switch (block->magic) {
case 'FLD1':
pLinkInfo->fldBlocks[fld_cntr] = (JPAFieldBlock*) new(pHeap, 0) JPAFieldBlockArc(pData + blockOffs);
JUT_ASSERT(274, pLinkInfo->fldBlocks[fld_cntr]);
@@ -156,19 +175,20 @@ void JPAEmitterArchiveLoader_v10::load() {
JUT_ASSERT(300, pLinkInfo->etxBlock);
break;
case 'TDB1':
pLinkInfo->texDataBase = (u16*)(block + 0x0c);
pLinkInfo->texDataBase = (u16*)&block->blockData;
break;
}
blockOffs += size;
}
getEmitterResource()->registration(pEmtrRes, *(u16*)(data + 0x18));
getEmitterResource()->registration(pEmtrRes, ptcl->resID);
offs = blockOffs;
}
for (s32 i = 0; i < header->texResNum; i++) {
u32 size = *(u32*)(pData + offs + 0x04);
const JUTDataBlockHeader* tex1Block = (const JUTDataBlockHeader*)(pData + offs);
u32 size = tex1Block->mSize;
JPATexture* pTex = new(pHeap, 0) JPATextureArc(pData + offs);
JUT_ASSERT(319, pTex);
getTextureResource()->registration(pTex);