Mirrors/openrw
1
0
Fork 0
mirror of https://github.com/rwengine/openrw.git synced 2024-11-07 03:12:36 +01:00
Code Issues Projects Releases Activity

Drop alpha name from TextureArchive lookup

Browse Source
This commit is contained in:
Daniel Evans 2016-12-03 21:04:07 +00:00
parent 15427b8f99
commit 6ca849dd8f
3 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rwlib/source/gl/TextureData.hpp
View File

@ -1,6 +1,7 @@
#pragma once
#include <gl/gl_core_3_3.h>
#include <glm/glm.hpp>
#include <map>
#include <memory>
@ -37,3 +38,4 @@ private:
glm::ivec2 size;
bool hasAlpha;
};
using TextureArchive = std::map<std::string, TextureData::Handle>;

6
rwlib/source/loaders/LoaderTXD.cpp
View File

@ -182,11 +182,7 @@ bool TextureLoader::loadFromMemory(FileHandle file,
auto texture = createTexture(texNative, rootSection);
inTextures[{name, alpha}] = texture;
if (!alpha.empty()) {
inTextures[{name, ""}] = texture;
}
inTextures[name] = texture;
}
return true;

2
rwlib/source/loaders/LoaderTXD.hpp
View File

@ -11,8 +11,6 @@
// This might suffice
#include <gl/TextureData.hpp>
typedef std::map<std::pair<std::string, std::string>, TextureData::Handle>
TextureArchive;
class FileIndex;