Merge branch 'master' into gfx-work

uilayer.h

@@ -1,3 +1,12 @@
+/*
+This Source Code Form is subject to the
+terms of the Mozilla Public License, v.
+2.0. If a copy of the MPL was not
+distributed with this file, You can
+obtain one at
+http://mozilla.org/MPL/2.0/.
+*/
+
 #pragma once
 
 #include <string>
@@ -6,34 +15,99 @@
 
 // GuiLayer -- basic user interface class. draws requested information on top of openGL screen
 
+class ui_panel {
+
+public:
+// constructor
+    ui_panel( std::string const &Identifier, bool const Isopen );
+// methods
+    virtual void update() {};
+    virtual void render();
+    virtual void render_contents();
+    // temporary  access
+// types
+    struct text_line {
+
+        std::string data;
+        glm::vec4 color;
+
+        text_line( std::string const &Data, glm::vec4 const &Color)
+            : data(Data), color(Color)
+        {}
+    };
+// members
+    std::string title;
+    bool is_open;
+    glm::ivec2 size { -1, -1 };
+    glm::ivec2 size_min { -1, -1 };
+    glm::ivec2 size_max { -1, -1 };
+    std::deque<text_line> text_lines;
+
+    std::string get_name() { return name; }
+
+protected:
+// members
+    std::string name;
+};
+
+class ui_expandable_panel : public ui_panel {
+public:
+    using ui_panel::ui_panel;
+
+    bool is_expanded { false };
+
+    void render_contents() override;
+};
+
+class ui_log_panel : public ui_panel {
+    using ui_panel::ui_panel;
+
+    void render_contents() override;
+};
+
 class ui_layer {
 
 public:
-// parameters:
+// constructors
+    ui_layer();
+// destructor
+    virtual ~ui_layer();
 
-// constructors:
-
-// destructor:
-    ~ui_layer();
-
-// methods:
+// methods
+    static
     bool
         init( GLFWwindow *Window );
-    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
+    // assign texturing hardware unit
+    static
+    void
+        set_unit( GLint const Textureunit ) { m_textureunit = Textureunit; }
+    static
+    void
+        shutdown();
+    // potentially processes provided input key. returns: true if the input was processed, false otherwise
+    virtual
     bool
         on_key( int const Key, int const Action );
+    // potentially processes provided mouse movement. returns: true if the input was processed, false otherwise
+    virtual
+    bool
+        on_cursor_pos( double const Horizontal, double const Vertical );
+    // potentially processes provided mouse button. returns: true if the input was processed, false otherwise
+    virtual
+    bool
+        on_mouse_button( int const Button, int const Action );
+    // updates state of UI elements
+    virtual
+    void
+        update();
 	// draws requested UI elements
 	void
         render();
+    //
+    static
+    void
+        set_cursor( int const Mode );
 	// stores operation progress
 	void
         set_progress( float const Progress = 0.0f, float const Subtaskprogress = 0.0f );
@@ -44,14 +118,34 @@ public:
         set_background( std::string const &Filename = "" );
     void
         set_tooltip( std::string const &Tooltip ) { m_tooltip = Tooltip; }
-    void set_cursor(int const Mode);
+    void
+        clear_panels();
+    void
+        push_back( ui_panel *Panel ) { m_panels.emplace_back( Panel ); }
 
-    std::deque<std::string> log;
+    // callback functions for imgui input
+    // returns true if input is consumed
+    static bool key_callback(int key, int scancode, int action, int mods);
+    static bool char_callback(unsigned int c);
+    static bool scroll_callback(double xoffset, double yoffset);
+    static bool mouse_button_callback(int button, int action, int mods);
 
-// members:
+
+protected:
+// members
+    static GLFWwindow *m_window;
+    static ImGuiIO *m_imguiio;
+    static bool m_cursorvisible;    
+
+   virtual void render_menu_contents();
+    ui_log_panel m_logpanel { "Log", true };
 
 private:
-// methods:
+// methods
+    // render() subclass details
+    virtual
+    void
+        render_() {};
     // draws background quad with specified earlier texture
     void
         render_background();
@@ -60,23 +154,18 @@ private:
         render_progress();
     void
         render_tooltip();
+    void render_panels();
 
-// members:
-    GLFWwindow *m_window { nullptr };
-    bool basic_info_active = false;
-    bool timetable_active = false;
-    bool vehicle_info_active = false;
-    bool renderer_debug_active = false;
-    bool about_active = false;
-    bool quit_active = false;
-    bool events_active = false;
-    bool log_active;
+   void render_menu();
 
-    bool m_cursorvisible;
+   void render_quit_widget();
 
-    ImGuiIO *imgui_io;
-
-    std::unique_ptr<map> m_map;
+    static std::unique_ptr<map> m_map;
+    // 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
+    static GLint m_textureunit;
 
     // progress bar config. TODO: put these together into an object
     float m_progress { 0.0f }; // percentage of filled progres bar, to indicate lengthy operations.
@@ -84,14 +173,7 @@ private:
     std::string m_progresstext; // label placed over 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<ui_panel *> m_panels;
     std::string m_tooltip;
-
-    // TODO: clean these legacy components up
-    int tprev; // poprzedni czas
-    double VelPrev; // poprzednia prędkość
-    double Acc; // przyspieszenie styczne
+    bool m_quit_active = false;
 };
-
-extern ui_layer UILayer;