zone/OpenAssetTools
zone/OpenAssetTools
2
0
Fork 0
mirror of https://github.com/Laupetin/OpenAssetTools.git synced 2025-04-21 08:35:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix T5 loading and dumping images

Browse Source
This commit is contained in:
Jan 2021-08-14 13:57:18 +02:00
parent 1e1485cedc
commit f052a97886
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/ObjLoading/Game/T5/ObjLoaderT5.cpp
View File

@ -104,11 +104,11 @@ void ObjLoader::LoadImageFromLoadDef(GfxImage* image, Zone* zone)
if (loadedTexture != nullptr) if (loadedTexture != nullptr)
{ {
image->texture.texture = loadedTexture; image->texture.texture = loadedTexture;
image->cardMemory.platform[0] = 0; image->loadedSize = 0;
const auto textureMipCount = loadedTexture->GetMipMapCount(); const auto textureMipCount = loadedTexture->GetMipMapCount();
for (auto mipLevel = 0; mipLevel < textureMipCount; mipLevel++) for (auto mipLevel = 0; mipLevel < textureMipCount; mipLevel++)
image->cardMemory.platform[0] += static_cast<int>(loadedTexture->GetSizeOfMipLevel(mipLevel) * loadedTexture->GetFaceCount()); image->loadedSize += static_cast<int>(loadedTexture->GetSizeOfMipLevel(mipLevel) * loadedTexture->GetFaceCount());
} }
} }
@ -130,11 +130,11 @@ void ObjLoader::LoadImageFromIwi(GfxImage* image, ISearchPath* searchPath, Zone*
if (loadedTexture != nullptr) if (loadedTexture != nullptr)
{ {
image->texture.texture = loadedTexture; image->texture.texture = loadedTexture;
image->cardMemory.platform[0] = 0; image->loadedSize = 0;
const auto textureMipCount = loadedTexture->GetMipMapCount(); const auto textureMipCount = loadedTexture->GetMipMapCount();
for (auto mipLevel = 0; mipLevel < textureMipCount; mipLevel++) for (auto mipLevel = 0; mipLevel < textureMipCount; mipLevel++)
image->cardMemory.platform[0] += static_cast<int>(loadedTexture->GetSizeOfMipLevel(mipLevel) * loadedTexture->GetFaceCount()); image->loadedSize += static_cast<int>(loadedTexture->GetSizeOfMipLevel(mipLevel) * loadedTexture->GetFaceCount());
} }
else else
{ {
@ -152,7 +152,7 @@ void ObjLoader::LoadImageData(ISearchPath* searchPath, Zone* zone)
{ {
auto* image = imageEntry->Asset(); auto* image = imageEntry->Asset();
if (image->cardMemory.platform[0] > 0) if (image->loadedSize > 0)
{ {
continue; continue;
} }