R5Reloaded/r5sdk
1
0
Fork 0
mirror of https://github.com/Mauler125/r5sdk.git synced 2025-02-09 19:15:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

Additional VPK lib cleanup and performance improvements

Browse Source
This commit is contained in:
Kawe Mazidjatari 2022-10-09 12:08:54 +02:00
parent 8880f4e7f0
commit 99a33e95f1
2 changed files with 46 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

88
r5dev/vpklib/packedstore.cpp
View File

@ -59,16 +59,16 @@ VPKDir_t CPackedStore::GetDirectoryFile(string svPackDirFile) const
{
StringReplace(svPackDirFile, smRegexMatches[0], "pak000_dir");
for (size_t i = 0; i < DIR_LOCALE.size(); i++)
for (const string& svLocale : DIR_LOCALE)
{
if (svPackDirFile.find(DIR_CONTEXT[i]) != string::npos)
if (svPackDirFile.find(svLocale) != string::npos)
{
for (size_t j = 0; j < DIR_CONTEXT.size(); j++)
for (const string& svContext : DIR_CONTEXT)
{
if (svPackDirFile.find(DIR_CONTEXT[j]) != string::npos)
if (svPackDirFile.find(svContext) != string::npos)
{
const string svPackDirPrefix = DIR_LOCALE[i] + DIR_LOCALE[i];
StringReplace(svPackDirFile, DIR_LOCALE[i], svPackDirPrefix);
const string svPackDirPrefix = svContext + svContext;
StringReplace(svPackDirFile, svContext, svPackDirPrefix);
goto escape;
}
}
@ -338,11 +338,11 @@ string CPackedStore::StripLocalePrefix(const string& svDirectoryFile) const
fs::path fsDirectoryFile(svDirectoryFile);
string svFileName = fsDirectoryFile.filename().u8string();
for (size_t i = 0; i < DIR_LOCALE.size(); i++)
for (const string& svLocale : DIR_LOCALE)
{
if (svFileName.find(DIR_LOCALE[i]) != string::npos)
if (svFileName.find(svLocale) != string::npos)
{
StringReplace(svFileName, DIR_LOCALE[i], "");
StringReplace(svFileName, svLocale, "");
break;
}
}
@ -385,14 +385,14 @@ void CPackedStore::BuildManifest(const vector<VPKEntryBlock_t>& vBlock, const st
{
nlohmann::json jEntry;
for (size_t i = 0; i < vBlock.size(); i++)
for (const VPKEntryBlock_t& vEntry : vBlock)
{
jEntry[vBlock[i].m_svEntryPath] =
jEntry[vEntry.m_svEntryPath] =
{
{ "preloadSize", vBlock[i].m_iPreloadSize },
{ "loadFlags", vBlock[i].m_vChunks[0].m_nLoadFlags },
{ "textureFlags", vBlock[i].m_vChunks[0].m_nTextureFlags },
{ "useCompression", vBlock[i].m_vChunks[0].m_nCompressedSize != vBlock[i].m_vChunks[0].m_nUncompressedSize },
{ "preloadSize", vEntry.m_iPreloadSize },
{ "loadFlags", vEntry.m_vChunks[0].m_nLoadFlags },
{ "textureFlags", vEntry.m_vChunks[0].m_nTextureFlags },
{ "useCompression", vEntry.m_vChunks[0].m_nCompressedSize != vEntry.m_vChunks[0].m_nUncompressedSize },
{ "useDataSharing", true }
};
}
@ -684,7 +684,8 @@ VPKEntryBlock_t::VPKEntryBlock_t(CIOStream* pReader, string svEntryPath)
// nTextureFlags -
// &svBlockPath -
//-----------------------------------------------------------------------------
VPKEntryBlock_t::VPKEntryBlock_t(const vector<uint8_t> &vData, int64_t nOffset, uint16_t nPreloadSize, uint16_t nArchiveIndex, uint32_t nLoadFlags, uint16_t nTextureFlags, const string& svEntryPath)
VPKEntryBlock_t::VPKEntryBlock_t(const vector<uint8_t> &vData, int64_t nOffset, uint16_t nPreloadSize,
uint16_t nArchiveIndex, uint32_t nLoadFlags, uint16_t nTextureFlags, const string& svEntryPath)
{
m_nFileCRC = crc32::update(NULL, vData.data(), vData.size());
m_iPreloadSize = nPreloadSize;
@ -695,7 +696,7 @@ VPKEntryBlock_t::VPKEntryBlock_t(const vector<uint8_t> &vData, int64_t nOffset,
size_t nDataSize = vData.size();
int64_t nCurrentOffset = nOffset;
for (size_t i = 0; i < nEntryCount; i++) // Fragment data into 1 MiB chunks
for (size_t i = 0; i < nEntryCount; i++) // Fragment data into 1 MiB chunks.
{
size_t nSize = std::min<uint64_t>(ENTRY_MAX_LEN, nDataSize);
nDataSize -= nSize;
@ -726,7 +727,8 @@ VPKChunkDescriptor_t::VPKChunkDescriptor_t(CIOStream* pReader)
// nCompressedSize -
// nUncompressedSize -
//-----------------------------------------------------------------------------
VPKChunkDescriptor_t::VPKChunkDescriptor_t(uint32_t nLoadFlags, uint16_t nTextureFlags, uint64_t nArchiveOffset, uint64_t nCompressedSize, uint64_t nUncompressedSize)
VPKChunkDescriptor_t::VPKChunkDescriptor_t(uint32_t nLoadFlags, uint16_t nTextureFlags,
uint64_t nArchiveOffset, uint64_t nCompressedSize, uint64_t nUncompressedSize)
{
m_nLoadFlags = nLoadFlags;
m_nTextureFlags = nTextureFlags;
@ -777,7 +779,7 @@ void VPKDir_t::Build(const string& svDirectoryFile, const vector<VPKEntryBlock_t
{
CIOStream writer(svDirectoryFile, CIOStream::Mode_t::WRITE);
auto vMap = std::map<string, std::map<string, std::list<VPKEntryBlock_t>>>();
uint64_t nDescriptors = 0i64;
uint64_t nDescriptors = 0;
writer.Write<uint32_t>(this->m_vHeader.m_nHeaderMarker);
writer.Write<uint16_t>(this->m_vHeader.m_nMajorVersion);
@ -813,34 +815,34 @@ void VPKDir_t::Build(const string& svDirectoryFile, const vector<VPKEntryBlock_t
writer.WriteString(jKeyValue.first);
for (auto& vEntry : jKeyValue.second)
{
/*Write entry block*/
writer.WriteString(GetFileName(vEntry.m_svEntryPath, true));
{/*Write entry block*/
writer.Write(vEntry.m_nFileCRC);
writer.Write(vEntry.m_iPreloadSize);
writer.Write(vEntry.m_iPackFileIndex);
writer.Write(vEntry.m_nFileCRC);
writer.Write(vEntry.m_iPreloadSize);
writer.Write(vEntry.m_iPackFileIndex);
for (size_t i = 0; i < vEntry.m_vChunks.size(); i++)
for (size_t i = 0, nc = vEntry.m_vChunks.size(); i < nc; i++)
{
/*Write chunk descriptor*/
const VPKChunkDescriptor_t* pDescriptor = &vEntry.m_vChunks[i];
writer.Write(pDescriptor->m_nLoadFlags);
writer.Write(pDescriptor->m_nTextureFlags);
writer.Write(pDescriptor->m_nArchiveOffset);
writer.Write(pDescriptor->m_nCompressedSize);
writer.Write(pDescriptor->m_nUncompressedSize);
if (i != (nc - 1))
{
{/*Write chunk descriptor*/
writer.Write(vEntry.m_vChunks[i].m_nLoadFlags);
writer.Write(vEntry.m_vChunks[i].m_nTextureFlags);
writer.Write(vEntry.m_vChunks[i].m_nArchiveOffset);
writer.Write(vEntry.m_vChunks[i].m_nCompressedSize);
writer.Write(vEntry.m_vChunks[i].m_nUncompressedSize);
}
if (i != (vEntry.m_vChunks.size() - 1))
{
const ushort s = 0;
writer.Write(s);
}
else
{
const ushort s = UINT16_MAX;
writer.Write(s);
}
nDescriptors++;
const ushort s = 0;
writer.Write(s);
}
else
{
const ushort s = UINT16_MAX;
writer.Write(s);
}
nDescriptors++;
}
}
writer.Write<uint8_t>('\0');

2
r5dev/vpklib/packedstore.h
View File

@ -132,7 +132,7 @@ struct VPKDir_t
struct VPKPair_t
{
string m_svBlockName;
string m_svBlockName; // !TODO: Multi-pak support.
string m_svDirectoryName;
};