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

Merge remote-tracking branch 'tmj-fstate/mover_in_c++' into mover_in_c++

This commit is contained in:
firleju
2017-07-31 09:06:17 +02:00
13 changed files with 658 additions and 175 deletions

View File

@@ -41,6 +41,8 @@ public:
// methods:
bool
init( GLFWwindow *Window );
void
set_unit( GLint const Textureunit ) { m_textureunit = Textureunit; }
// draws requested UI elements
void
render();
@@ -83,6 +85,7 @@ private:
// members:
GLFWwindow *m_window { nullptr };
GLint m_textureunit{ GL_TEXTURE0 };
GLuint m_fontbase { (GLuint)-1 }; // numer DL dla znak<61>w w napisach
// progress bar config. TODO: put these together into an object