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

merged upstream changes

This commit is contained in:
tmj-fstate
2017-02-21 17:26:44 +01:00
16 changed files with 876 additions and 919 deletions

View File

@@ -25,7 +25,7 @@ struct opengl_texture {
void load();
void create();
// members
GLuint id{ -1 }; // associated GL resource
GLuint id{ (GLuint) -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 traits; // requested texture attributes: wrapping modes etc