Merge branch 'tmj-dev' into milek-dev

uilayer.h

@@ -40,8 +40,15 @@ public:
 // methods:
     bool
         init( GLFWwindow *Window );
+    // assign texturing hardware unit
     void
         set_unit( GLint const Textureunit ) { m_textureunit = Textureunit; }
+    // potentially processes provided input key. returns: true if the input was processed, false otherwise
+    bool
+        on_key( int const Key, int const Action );
+    // updates state of UI elements
+    void
+        update();
 	// draws requested UI elements
 	void
         render();
@@ -85,11 +92,10 @@ private:
     void
         quad( glm::vec4 const &Coordinates, glm::vec4 const &Color );
 
-
 // members:
     GLFWwindow *m_window { nullptr };
     GLint m_textureunit{ GL_TEXTURE0 };
-    GLuint m_fontbase { (GLuint)-1 }; // numer DL dla znak<EFBFBD>w w napisach
+    GLuint m_fontbase { (GLuint)-1 }; // numer DL dla znakó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.
@@ -101,6 +107,13 @@ private:
     GLuint m_texture { 0 };
     std::vector<std::shared_ptr<ui_panel> > m_panels;
     std::string m_tooltip;
+    // TODO: clean these legacy components up
+    std::shared_ptr<ui_panel> UIHeader; // header ui panel
+    std::shared_ptr<ui_panel> UITable; // schedule or scan table
+    std::shared_ptr<ui_panel> UITranscripts; // voice transcripts
+    int tprev; // poprzedni czas
+    double VelPrev; // poprzednia prędkość
+    double Acc; // przyspieszenie styczne
 };
 
 extern ui_layer UILayer;