zone/OpenAssetTools
zone/OpenAssetTools
2
0
Fork 0
mirror of https://github.com/Laupetin/OpenAssetTools.git synced 2025-04-19 15:52:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Replace magic numbers with macros from zutil.h. Compress animtrees when linking.

Browse Source
This commit is contained in:
JezuzLizard 2023-12-12 20:59:26 -08:00
parent 4b05c6aa9b
commit 76a98e65fd
3 changed files with 83 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderRawFile.cpp
View File

@ -3,10 +3,16 @@
#include "Game/T6/T6.h"
#include "Pool/GlobalAssetPool.h"
#include <iostream>
#include <filesystem>
#include <cstring>
#include <zlib.h>
#include <zutil.h>
using namespace T6;
namespace fs = std::filesystem;
void* AssetLoaderRawFile::CreateEmptyAsset(const std::string& assetName, MemoryManager* memory)
{
auto* rawFile = memory->Create<RawFile>();
@ -20,13 +26,61 @@ bool AssetLoaderRawFile::CanLoadFromRaw() const
return true;
}
bool AssetLoaderRawFile::LoadFromRaw(
const std::string& assetName, ISearchPath* searchPath, MemoryManager* memory, IAssetLoadingManager* manager, Zone* zone) const
bool AssetLoaderRawFile::LoadAnimtree(
const SearchPathOpenFile& file, const std::string& assetName, ISearchPath* searchPath, MemoryManager* memory, IAssetLoadingManager* manager)
{
const auto file = searchPath->Open(assetName);
if (!file.IsOpen())
const auto uncompressedBuffer = std::make_unique<char[]>(static_cast<size_t>(file.m_length + 1));
file.m_stream->read(uncompressedBuffer.get(), file.m_length);
if (file.m_stream->gcount() != file.m_length)
return false;
uncompressedBuffer[static_cast<size_t>(file.m_length)] = '\0';
const auto compressionBufferSize = static_cast<size_t>(file.m_length + 1 + sizeof(uint32_t) + COMPRESSED_BUFFER_SIZE_PADDING);
auto* compressedBuffer = static_cast<char*>(memory->Alloc(compressionBufferSize));
z_stream_s zs{};
zs.zalloc = Z_NULL;
zs.zfree = Z_NULL;
zs.opaque = Z_NULL;
zs.avail_in = static_cast<uInt>(file.m_length + 1);
zs.avail_out = compressionBufferSize;
zs.next_in = reinterpret_cast<const Bytef*>(uncompressedBuffer.get());
zs.next_out = reinterpret_cast<Bytef*>(&compressedBuffer[sizeof(uint32_t)]);
int ret = deflateInit2(&zs, Z_DEFAULT_COMPRESSION, Z_DEFLATED, -DEF_WBITS, DEF_MEM_LEVEL, Z_DEFAULT_STRATEGY);
if (ret != Z_OK)
{
throw std::runtime_error("Initializing deflate failed");
}
ret = deflate(&zs, Z_FINISH);
if (ret != Z_STREAM_END)
{
std::cout << "Deflate failed for loading animtree file \"" << assetName << "\"" << std::endl;
deflateEnd(&zs);
return false;
}
const auto compressedSize = compressionBufferSize + sizeof(uint32_t) - zs.avail_out;
reinterpret_cast<uint32_t*>(compressedBuffer)[0] = static_cast<uint32_t>(file.m_length + 1); // outLen
auto* rawFile = memory->Create<RawFile>();
rawFile->name = memory->Dup(assetName.c_str());
rawFile->len = static_cast<int>(compressedSize);
rawFile->buffer = static_cast<const char*>(compressedBuffer);
manager->AddAsset(ASSET_TYPE_RAWFILE, assetName, rawFile);
return true;
}
bool AssetLoaderRawFile::LoadDefault(
const SearchPathOpenFile& file, const std::string& assetName, ISearchPath* searchPath, MemoryManager* memory, IAssetLoadingManager* manager)
{
auto* rawFile = memory->Create<RawFile>();
rawFile->name = memory->Dup(assetName.c_str());
rawFile->len = static_cast<int>(file.m_length);
@ -39,6 +93,20 @@ bool AssetLoaderRawFile::LoadFromRaw(
rawFile->buffer = static_cast<char16*>(fileBuffer);
manager->AddAsset(ASSET_TYPE_RAWFILE, assetName, rawFile);
return true;
}
bool AssetLoaderRawFile::LoadFromRaw(
const std::string& assetName, ISearchPath* searchPath, MemoryManager* memory, IAssetLoadingManager* manager, Zone* zone) const
{
const auto file = searchPath->Open(assetName);
if (!file.IsOpen())
return false;
const fs::path rawFilePath(assetName);
const auto extension = rawFilePath.extension().string();
if (extension == ".atr")
return LoadAnimtree(file, assetName, searchPath, memory, manager);
return LoadDefault(file, assetName, searchPath, memory, manager);
}

6
src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderRawFile.h
View File

@ -8,6 +8,12 @@ namespace T6
{
class AssetLoaderRawFile final : public BasicAssetLoader<ASSET_TYPE_RAWFILE, RawFile>
{
static constexpr size_t COMPRESSED_BUFFER_SIZE_PADDING = 64;
static bool LoadAnimtree(
const SearchPathOpenFile& file, const std::string& assetName, ISearchPath* searchPath, MemoryManager* memory, IAssetLoadingManager* manager);
static bool LoadDefault(
const SearchPathOpenFile& file, const std::string& assetName, ISearchPath* searchPath, MemoryManager* memory, IAssetLoadingManager* manager);
public:
_NODISCARD void* CreateEmptyAsset(const std::string& assetName, MemoryManager* memory) override;
_NODISCARD bool CanLoadFromRaw() const override;

5
src/ObjWriting/Game/T6/AssetDumpers/AssetDumperRawFile.cpp
View File

@ -2,6 +2,7 @@
#include <filesystem>
#include <zlib.h>
#include <zutil.h>
using namespace T6;
@ -39,7 +40,7 @@ void AssetDumperRawFile::DumpAnimtree(AssetDumpingContext& context, XAssetInfo<R
zs.avail_in = 0;
zs.next_in = Z_NULL;
int ret = inflateInit2(&zs, -13);
int ret = inflateInit2(&zs, -DEF_WBITS);
if (ret != Z_OK)
{
@ -47,7 +48,7 @@ void AssetDumperRawFile::DumpAnimtree(AssetDumpingContext& context, XAssetInfo<R
}
zs.next_in = reinterpret_cast<const Bytef*>(&rawFile->buffer[4]);
zs.avail_in = inLen - 4;
zs.avail_in = inLen - sizeof(uint32_t);
Bytef buffer[0x1000];