Added basic support for tracking DUMB dependencies

This commit is contained in:
parax0
2016-12-03 14:32:41 -07:00
parent f6fd78af14
commit efa85036c2
7 changed files with 90 additions and 15 deletions

View File

@@ -70,6 +70,7 @@ public:
case eArea: pRes = CAreaLoader::LoadMREA(rInput, pEntry); break;
case eAudioGroup: pRes = CAudioGroupLoader::LoadAGSC(rInput, pEntry); break;
case eAudioLookupTable: pRes = CAudioGroupLoader::LoadATBL(rInput, pEntry); break;
case eBinaryData: pRes = CUnsupportedFormatLoader::LoadDUMB(rInput, pEntry); break;
case eDependencyGroup: pRes = CDependencyGroupLoader::LoadDGRP(rInput, pEntry); break;
case eDynamicCollision: pRes = CCollisionLoader::LoadDCLN(rInput, pEntry); break;
case eFont: pRes = CFontLoader::LoadFONT(rInput, pEntry); break;

View File

@@ -13,6 +13,48 @@ CDependencyGroup* CUnsupportedFormatLoader::LoadCSNG(IInputStream& rCSNG, CResou
return pGroup;
}
CDependencyGroup* CUnsupportedFormatLoader::LoadDUMB(IInputStream& rDUMB, CResourceEntry *pEntry)
{
// Check for HIER, which needs special handling
if (CFourCC(rDUMB.PeekLong()) == "HIER")
return LoadHIER(rDUMB, pEntry);
// Load other DUMB file. DUMB files don't have a set format - they're different between different files
std::vector<u8> Data(rDUMB.Size());
rDUMB.ReadBytes(Data.data(), Data.size());
CDependencyGroup *pGroup = new CDependencyGroup(pEntry);
u32 MaxIndex = (pEntry->Game() <= eEchoes ? Data.size() - 3 : Data.size() - 7);
CAssetID ID;
for (u32 iByte = 0; iByte < MaxIndex; iByte++)
{
if (pEntry->Game() <= eEchoes)
{
ID = ( (Data[iByte+0] << 24) |
(Data[iByte+1] << 16) |
(Data[iByte+2] << 8) |
(Data[iByte+3] << 0) );
}
else
{
ID = ( ((u64) Data[iByte+0] << 56) |
((u64) Data[iByte+1] << 48) |
((u64) Data[iByte+2] << 40) |
((u64) Data[iByte+3] << 32) |
((u64) Data[iByte+4] << 24) |
((u64) Data[iByte+5] << 16) |
((u64) Data[iByte+6] << 8) |
((u64) Data[iByte+7] << 0) );
}
if (gpResourceStore->IsResourceRegistered(ID))
pGroup->AddDependency(ID);
}
return pGroup;
}
CDependencyGroup* CUnsupportedFormatLoader::LoadFRME(IInputStream& rFRME, CResourceEntry *pEntry)
{
u32 Version = rFRME.ReadLong();
@@ -223,6 +265,25 @@ CDependencyGroup* CUnsupportedFormatLoader::LoadFSM2(IInputStream& rFSM2, CResou
return pOut;
}
CDependencyGroup* CUnsupportedFormatLoader::LoadHIER(IInputStream& rHIER, CResourceEntry *pEntry)
{
CFourCC Magic = rHIER.ReadLong();
ASSERT(Magic == "HIER");
u32 NumNodes = rHIER.ReadLong();
CDependencyGroup *pOut = new CDependencyGroup(pEntry);
for (u32 iNode = 0; iNode < NumNodes; iNode++)
{
// NOTE: The SCAN ID isn't considered a real dependency!
pOut->AddDependency( rHIER.ReadLong() );
rHIER.ReadString();
rHIER.Seek(0x8, SEEK_CUR);
}
return pOut;
}
CDependencyGroup* CUnsupportedFormatLoader::LoadHINT(IInputStream& rHINT, CResourceEntry *pEntry)
{
u32 Magic = rHINT.ReadLong();

View File

@@ -12,8 +12,10 @@ class CUnsupportedFormatLoader
public:
static CDependencyGroup* LoadCSNG(IInputStream& rCSNG, CResourceEntry *pEntry);
static CDependencyGroup* LoadDUMB(IInputStream& rDUMB, CResourceEntry *pEntry);
static CDependencyGroup* LoadFRME(IInputStream& rFRME, CResourceEntry *pEntry);
static CDependencyGroup* LoadFSM2(IInputStream& rFSM2, CResourceEntry *pEntry);
static CDependencyGroup* LoadHIER(IInputStream& rHIER, CResourceEntry *pEntry);
static CDependencyGroup* LoadHINT(IInputStream& rHINT, CResourceEntry *pEntry);
static CDependencyGroup* LoadMAPW(IInputStream& rMAPW, CResourceEntry *pEntry);
static CDependencyGroup* LoadMAPU(IInputStream& rMAPU, CResourceEntry *pEntry);