16
0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-07-21 13:39:18 +02:00

recognition of basic texture traits

This commit is contained in:
tmj-fstate
2017-02-13 15:55:55 +01:00
parent 377d661e68
commit 6ed00729fc
2 changed files with 64 additions and 24 deletions

View File

@@ -28,7 +28,7 @@ struct opengl_texture {
GLuint id{ -1 }; // associated GL resource
bool has_alpha{ false }; // indicates the texture has alpha channel
bool is_ready{ false }; // indicates the texture was processed and is ready for use
std::string attributes; // requested texture attributes: wrapping modes etc
std::string traits; // requested texture attributes: wrapping modes etc
std::string name; // name of the texture source file
private:
@@ -95,6 +95,7 @@ private:
static const size_type npos{ 0 }; // should be -1, but the rest of the code uses -1 for something else
opengltexture_array m_textures;
index_map m_texturemappings;
size_type m_activetexture{ 0 }; // last i.e. currently bound texture
};
extern texture_manager TextureManager;