natsirt/noggit-red
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

migrate to BlizzardArchive library for file reading

Browse Source
This commit is contained in:
Skarn
2021-12-11 21:30:45 +03:00
parent b148eb2ce3
commit cb32b9a8eb
62 changed files with 354 additions and 744 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/noggit/texture_set.cpp
View File

@@ -7,6 +7,7 @@
#include <noggit/TextureManager.h> // TextureManager, Texture
#include <noggit/World.h>
#include <noggit/texture_set.hpp>
#include <ClientFile.hpp>
#include <algorithm> // std::min
#include <array>
@@ -14,7 +15,7 @@
#include <boost/utility/in_place_factory.hpp>
TextureSet::TextureSet (MapChunk* chunk, MPQFile* f, size_t base, MapTile* tile
TextureSet::TextureSet (MapChunk* chunk, BlizzardArchive::ClientFile* f, size_t base, MapTile* tile
, bool use_big_alphamaps, bool do_not_fix_alpha_map, bool do_not_convert_alphamaps
, noggit::NoggitRenderContext context)
: nTextures(chunk->header.nLayers)
@@ -261,7 +262,7 @@ bool TextureSet::canPaintTexture(scoped_blp_texture_reference const& texture)
const std::string& TextureSet::filename(size_t id)
{
return textures[id]->filename;
return textures[id]->_file_key.filepath();
}
bool TextureSet::eraseUnusedTextures()