zone/OpenAssetTools
2
0
Fork 0
mirror of https://github.com/Laupetin/OpenAssetTools.git synced 2025-07-03 09:41:50 +00:00
Code Activity

refactor: image and obj data loading

Browse Source
This commit is contained in:
Jan
2024-09-24 12:01:42 +01:00
parent 5fee875495
commit 5cc52c42cd
97 changed files with 1784 additions and 1878 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/ObjLoading/Game/IW3/AssetLoaders/AssetLoaderGfxImage.cpp
View File

@ -5,7 +5,9 @@
#include "Image/IwiTypes.h"
#include "Pool/GlobalAssetPool.h"
#include <algorithm>
#include <cstring>
#include <format>
#include <iostream>
using namespace IW3;
@ -32,20 +34,9 @@ bool AssetLoaderGfxImage::LoadFromRaw(
return false;
std::string safeAssetName = assetName;
for (auto& c : safeAssetName)
{
switch (c)
{
case '*':
c = '_';
break;
std::ranges::replace(safeAssetName, '*', '_');
default:
break;
}
}
const auto file = searchPath->Open("images/" + safeAssetName + ".dds");
const auto file = searchPath->Open(std::format("images/{}.dds", safeAssetName));
if (!file.IsOpen())
return false;
@ -54,7 +45,7 @@ bool AssetLoaderGfxImage::LoadFromRaw(
if (texture == nullptr)
{
std::cout << "Failed to load dds file for image asset \"" << assetName << "\"\n";
std::cout << std::format("Failed to load dds file for image asset \"{}\"\n", assetName);
return false;
}