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

Merge branch 'tmj-dev' into milek-dev

This commit is contained in:
milek7
2018-07-17 16:20:11 +02:00
77 changed files with 2959 additions and 2171 deletions

View File

@@ -52,6 +52,9 @@ public:
// draws requested UI elements
void
render();
//
void
set_cursor( int const Mode );
// stores operation progress
void
set_progress( float const Progress = 0.0f, float const Subtaskprogress = 0.0f );
@@ -114,6 +117,7 @@ private:
int tprev; // poprzedni czas
double VelPrev; // poprzednia prędkość
double Acc; // przyspieszenie styczne
bool m_cursorvisible { false };
};
extern ui_layer UILayer;