mirror of
https://github.com/rwengine/openrw.git
synced 2024-11-07 03:12:36 +01:00
Drop alpha name from TextureArchive lookup
This commit is contained in:
parent
15427b8f99
commit
6ca849dd8f
@ -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>;
|
||||
|
@ -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;
|
||||
|
@ -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;
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user