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

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

This commit is contained in:
firleju
2017-07-20 21:33:05 +02:00
45 changed files with 3988 additions and 2376 deletions

View File

@@ -47,9 +47,13 @@ public:
// stores operation progress
void
set_progress( float const Progress = 0.0f, float const Subtaskprogress = 0.0f );
void
set_progress( std::string const &Text ) { m_progresstext = Text; }
// sets the ui background texture, if any
void
set_background( std::string const &Filename = "" );
void
set_tooltip( std::string const &Tooltip ) { m_tooltip = Tooltip; }
void
clear_texts() { m_panels.clear(); }
void
@@ -67,6 +71,8 @@ private:
render_progress();
void
render_panels();
void
render_tooltip();
// prints specified text, using display lists font
void
print( std::string const &Text );
@@ -76,11 +82,18 @@ private:
// members:
GLuint m_fontbase{ static_cast<GLuint>(-1) }; // numer DL dla znaków w napisach
float m_progress{ 0.0f }; // percentage of filled progres bar, to indicate lengthy operations.
float m_subtaskprogress{ 0.0f }; // percentage of filled progres bar, to indicate lengthy operations.
texture_handle m_background; // path to texture used as the background. size depends on mAspect.
GLFWwindow *m_window { nullptr };
GLuint m_fontbase { (GLuint)-1 }; // numer DL dla znak<61>w w napisach
// progress bar config. TODO: put these together into an object
float m_progress { 0.0f }; // percentage of filled progres bar, to indicate lengthy operations.
float m_subtaskprogress{ 0.0f }; // percentage of filled progres bar, to indicate lengthy operations.
std::string m_progresstext; // label placed over the progress bar
bool m_progressbottom { false }; // location of the progress bar
texture_handle m_background { NULL }; // path to texture used as the background. size depends on mAspect.
std::vector<std::shared_ptr<ui_panel> > m_panels;
std::string m_tooltip;
};
extern ui_layer UILayer;