feat: load iw5 images from raw

This commit is contained in:
Jan 2024-09-22 16:59:56 +02:00
parent 7b28b574d2
commit d4d8e83169
No known key found for this signature in database
GPG Key ID: 44B581F78FF5C57C
2 changed files with 51 additions and 3 deletions

View File

@ -1,17 +1,62 @@
#include "AssetLoaderGfxImage.h" #include "AssetLoaderGfxImage.h"
#include "Game/IW5/IW5.h" #include "Game/IW5/IW5.h"
#include "ObjLoading.h" #include "Image/IwiLoader.h"
#include "Pool/GlobalAssetPool.h" #include "Pool/GlobalAssetPool.h"
#include <cstring> #include <cstring>
#include <format>
#include <iostream>
#include <sstream>
using namespace IW5; using namespace IW5;
void* AssetLoaderGfxImage::CreateEmptyAsset(const std::string& assetName, MemoryManager* memory) void* AssetLoaderGfxImage::CreateEmptyAsset(const std::string& assetName, MemoryManager* memory)
{ {
auto* asset = memory->Alloc<AssetImage::Type>();
asset->name = memory->Dup(assetName.c_str());
return asset;
}
bool AssetLoaderGfxImage::CanLoadFromRaw() const
{
return true;
}
bool AssetLoaderGfxImage::LoadFromRaw(
const std::string& assetName, ISearchPath* searchPath, MemoryManager* memory, IAssetLoadingManager* manager, Zone* zone) const
{
const auto fileName = std::format("images/{}.iwi", assetName);
const auto file = searchPath->Open(fileName);
if (!file.IsOpen())
return false;
const auto fileSize = static_cast<size_t>(file.m_length);
const auto fileData = std::make_unique<char[]>(fileSize);
file.m_stream->read(fileData.get(), fileSize);
MemoryManager tempMemory;
IwiLoader iwiLoader(&tempMemory);
std::istringstream ss(std::string(fileData.get(), fileSize));
const auto texture = iwiLoader.LoadIwi(ss);
if (!texture)
{
std::cerr << std::format("Failed to load texture from: {}\n", fileName);
return false;
}
auto* image = memory->Create<GfxImage>(); auto* image = memory->Create<GfxImage>();
memset(image, 0, sizeof(GfxImage)); memset(image, 0, sizeof(GfxImage));
image->name = memory->Dup(assetName.c_str()); image->name = memory->Dup(assetName.c_str());
return image; image->noPicmip = !texture->HasMipMaps();
image->width = static_cast<uint16_t>(texture->GetWidth());
image->height = static_cast<uint16_t>(texture->GetHeight());
image->depth = static_cast<uint16_t>(texture->GetDepth());
image->texture.loadDef = memory->Alloc<GfxImageLoadDef>();
manager->AddAsset<AssetImage>(assetName, image);
return true;
} }

View File

@ -1,6 +1,6 @@
#pragma once #pragma once
#include "AssetLoading/BasicAssetLoader.h" #include "AssetLoading/BasicAssetLoader.h"
#include "AssetLoading/IAssetLoadingManager.h"
#include "Game/IW5/IW5.h" #include "Game/IW5/IW5.h"
#include "SearchPath/ISearchPath.h" #include "SearchPath/ISearchPath.h"
@ -10,5 +10,8 @@ namespace IW5
{ {
public: public:
_NODISCARD void* CreateEmptyAsset(const std::string& assetName, MemoryManager* memory) override; _NODISCARD void* CreateEmptyAsset(const std::string& assetName, MemoryManager* memory) override;
_NODISCARD bool CanLoadFromRaw() const override;
bool
LoadFromRaw(const std::string& assetName, ISearchPath* searchPath, MemoryManager* memory, IAssetLoadingManager* manager, Zone* zone) const override;
}; };
} // namespace IW5 } // namespace IW5