eu07/maszyna
16
0
Fork 0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-07-22 20:59:19 +02:00
Code Issues 123 Wiki Activity

Merge branch 'tmj-dev' into milek-dev

Browse Source
This commit is contained in:
milek7
2018-06-30 18:45:58 +02:00
parent 76bb4be325 30e31cdfd0
commit dc584c140e
37 changed files with 672 additions and 498 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
uilayer.h
View File

@@ -9,8 +9,8 @@ struct ui_panel {
struct text_line {
glm::vec4 color;
std::string data;
glm::vec4 color;
text_line( std::string const &Data, glm::vec4 const &Color):
data(Data), color(Color)
@@ -33,7 +33,7 @@ public:
// parameters:
// constructors:
ui_layer() = default;
// destructor:
~ui_layer();