imgui

uilayer.h

@@ -5,28 +5,6 @@
 
 // GuiLayer -- basic user interface class. draws requested information on top of openGL screen
 
-struct ui_panel {
-
-    struct text_line {
-
-        glm::vec4 color;
-        std::string data;
-
-        text_line( std::string const &Data, glm::vec4 const &Color):
-            data(Data), color(Color)
-        {}
-    };
-
-    ui_panel( const int X, const int Y):
-        origin_x(X), origin_y(Y)
-    {}
-
-	bool enabled = true;
-    std::deque<text_line> text_lines;
-    int origin_x;
-    int origin_y;
-};
-
 class ui_layer {
 
 public:
@@ -40,15 +18,18 @@ 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
+    void cleanup();
+
+    // callback functions for imgui input
+    // returns true if input is consumed
+    bool key_callback(int key, int scancode, int action, int mods);
+    bool char_callback(unsigned int c);
+    bool scroll_callback(double xoffset, double yoffset);
+    bool mouse_button_callback(int button, int action, int mods);
+
+    // potentially processes provided input. 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();
@@ -60,14 +41,10 @@ public:
 	// sets the ui background texture, if any
 	void
         set_background( std::string const &Filename = "" );
-    void
-        set_texture( GLuint Texture = 0 ) { m_texture = Texture; }
     void
         set_tooltip( std::string const &Tooltip ) { m_tooltip = Tooltip; }
-    void
-        clear_texts() { m_panels.clear(); }
-    void
-        push_back( std::shared_ptr<ui_panel> Panel ) { m_panels.emplace_back( Panel ); }
+
+    std::deque<std::string> log;
 
 // members:
 
@@ -76,41 +53,36 @@ private:
     // draws background quad with specified earlier texture
     void
         render_background();
-    void
-        render_texture();
     // draws a progress bar in defined earlier state
     void
         render_progress();
-    void
-        render_panels();
     void
         render_tooltip();
-    // prints specified text, using display lists font
-    void
-        print( std::string const &Text );
-    // draws a quad between coordinates x,y and z,w with uv-coordinates spanning 0-1
-    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ów w napisach
+    bool m_f1active = false;
+    bool m_f2active = false;
+    bool m_f3active = false;
+    bool m_f8active = false;
+    bool m_f9active = false;
+    bool m_f10active = false;
+    bool m_f11active = false;
+    bool log_active;
+
+    ImGuiIO *imgui_io;
 
     // 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_handle }; // path to texture used as the background. size depends on mAspect.
     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