Updated imgui, added consoleAction.

ChangeLog.md

@@ -5,6 +5,9 @@
     [ 20140107 ]
     * Fixed problems with FontTTFs Glyph Baseline
     * No longer using wrong assert() when glm is included
+    * Updated imgui, now Version 1.20
+    * Every imgui window is displayed separately and with close button
+    * Added consoleAction, defaulting to backquoteKey
 
     [ 20150106 ]
     * Removed SDL2-TTF Font implementation

data/OpenRaider.ini

@@ -22,6 +22,7 @@ set mouse_y    0.75
 
 bind menu     "escape"
 bind debug    'q'
+bind console  "backquote"
 bind forward  'w'
 bind backward 's'
 bind left     'a'

include/Console.h

@@ -17,13 +17,16 @@ class Console {
   public:
     static void display();
 
+    static bool isVisible() { return visible; }
+    static void setVisible(bool v) { visible = v; }
+
   private:
     static void callback(ImGuiTextEditCallbackData* data);
 
     const static int bufferLength = 256;
+
+    static bool visible;
     static char buffer[bufferLength + 1];
-    static bool scrollToBottom;
-    static bool focusInput;
     static unsigned long lastLogLength;
     static std::vector<std::string> lastCommands;
     static long lastCommandIndex;

include/UI.h

@@ -17,7 +17,7 @@
 
 #include "system/Shader.h"
 
-class ImDrawList;
+struct ImDrawList;
 
 class UI {
   public:
@@ -27,8 +27,8 @@ class UI {
     static void shutdown();
     static void setSize(glm::i32vec2 s);
 
-    static void setVisible(bool v);
-    static bool isVisible();
+    static void setVisible(bool v) { visible = v; }
+    static bool isVisible() { return visible; }
 
     static void handleKeyboard(KeyboardButton key, bool pressed);
     static void handleText(char* text, bool notFinished);

include/global.h

@@ -27,6 +27,7 @@ const unsigned char CYAN[]   = {   0, 255, 255, 255 };
 typedef enum {
     menuAction = 0,
     debugAction,
+    consoleAction,
 
     forwardAction,
     backwardAction,

src/Console.cpp

@@ -15,9 +15,8 @@
 #include "commands/Command.h"
 #include "Console.h"
 
+bool Console::visible = false;
 char Console::buffer[bufferLength + 1] = "";
-bool Console::scrollToBottom = false;
-bool Console::focusInput = false;
 unsigned long Console::lastLogLength = 0;
 std::vector<std::string> Console::lastCommands;
 long Console::lastCommandIndex = -1;
@@ -71,7 +70,11 @@ void Console::callback(ImGuiTextEditCallbackData* data) {
 }
 
 void Console::display() {
-    if (ImGui::Begin("Console", nullptr, ImVec2(600, 400))) {
+    if (!visible)
+        return;
+
+    static bool scrollToBottom = false;
+    if (ImGui::Begin("Console", &visible, ImVec2(600, 400))) {
         if (lastLogLength != getLog().size()) {
             lastLogLength = getLog().size();
             scrollToBottom = true;
@@ -87,6 +90,7 @@ void Console::display() {
         }
         ImGui::EndChild();
 
+        bool focusInput = false;
         if (ImGui::InputText("Command", buffer, bufferLength,
                              ImGuiInputTextFlags_EnterReturnsTrue
                              | ImGuiInputTextFlags_CallbackCompletion

src/RunTime.cpp

@@ -48,6 +48,7 @@ void RunTime::initialize() {
     // Default key bindings
     keyBindings[menuAction] = escapeKey;
     keyBindings[debugAction] = qKey;
+    keyBindings[consoleAction] = backquoteKey;
     keyBindings[forwardAction] = wKey;
     keyBindings[backwardAction] = sKey;
     keyBindings[leftAction] = aKey;

src/UI.cpp

@@ -113,7 +113,7 @@ void UI::eventsFinished() {
 
     ImGui::NewFrame();
 
-    if (!visible) {
+    if (!(visible || Console::isVisible())) {
         while (!clickEvents.empty()) {
             auto i = clickEvents.front();
             if (getMenu().isVisible()) {
@@ -144,7 +144,7 @@ void UI::eventsFinished() {
     while (!keyboardEvents.empty()) {
         auto i = keyboardEvents.front();
 
-        if (!visible) {
+        if (!(visible || Console::isVisible())) {
             if (getMenu().isVisible()) {
                 getMenu().handleKeyboard(std::get<0>(i), std::get<1>(i));
             } else {
@@ -156,16 +156,21 @@ void UI::eventsFinished() {
         }
 
         if (std::get<1>(i)) {
-            if (!visible) {
+            if (!(visible || Console::isVisible())) {
                 if (RunTime::getKeyBinding(menuAction) == std::get<0>(i)) {
                     getMenu().setVisible(!getMenu().isVisible());
                 }
             }
 
-            if ((!io.WantCaptureKeyboard) || (!visible)) {
-                if (RunTime::getKeyBinding(debugAction) == std::get<0>(i)) {
-                    if (!metaKeyIsActive)
+            if ((!io.WantCaptureKeyboard) || (!(visible || Console::isVisible()))) {
+                if (!metaKeyIsActive) {
+                    if (RunTime::getKeyBinding(debugAction) == std::get<0>(i)) {
                         visible = !visible;
+                    }
+
+                    if (RunTime::getKeyBinding(consoleAction) == std::get<0>(i)) {
+                        Console::setVisible(!Console::isVisible());
+                    }
                 }
             }
         }
@@ -174,24 +179,22 @@ void UI::eventsFinished() {
     }
 
     bool clicked = !clickEvents.empty();
-    // Only already empty when !visible
-    if (visible) {
-        clickEvents.clear();
-        motionEvents.clear();
-        scrollEvents.clear();
-    }
+    clickEvents.clear();
+    motionEvents.clear();
+    scrollEvents.clear();
 
-    if (visible && (
+    if ((visible || Console::isVisible()) && (
             ((!io.WantCaptureKeyboard) && io.KeysDown[escapeKey])
             || ((!io.WantCaptureMouse) && clicked)
         )) {
         visible = false;
+        Console::setVisible(false);
     }
 
-    if (Window::getTextInput() != visible)
-        Window::setTextInput(visible);
+    if (Window::getTextInput() != (visible || Console::isVisible()))
+        Window::setTextInput(visible || Console::isVisible());
 
-    bool input = !(visible || getMenu().isVisible());
+    bool input = !(visible || Console::isVisible() || getMenu().isVisible());
     if (Window::getMousegrab() != input)
         Window::setMousegrab(input);
 
@@ -199,13 +202,15 @@ void UI::eventsFinished() {
 }
 
 void UI::display() {
-    if (!visible)
-        return;
-
     Console::display();
 
+    if (!visible) {
+        ImGui::Render();
+        return;
+    }
+
     static bool showTestWindow = false;
-    if (ImGui::Begin("Engine", nullptr, ImVec2(400, 400))) {
+    if (ImGui::Begin("Engine", &visible, ImVec2(400, 400))) {
         Render::displayUI();
         RunTime::display();
         SoundManager::display();
@@ -514,14 +519,6 @@ void UI::handleControllerButton(KeyboardButton button, bool released) {
     getGame().handleControllerButton(button, released);
 }
 
-void UI::setVisible(bool v) {
-    visible = v;
-}
-
-bool UI::isVisible() {
-    return visible;
-}
-
 void UI::renderImGui(ImDrawList** const cmd_lists, int cmd_lists_count) {
     if (cmd_lists_count == 0)
         return;

src/commands/CommandBind.cpp

@@ -66,6 +66,8 @@ ActionEvents CommandBind::stringToActionEvent(std::string action) {
         return menuAction;
     } else if (action == "debug") {
         return debugAction;
+    } else if (action == "console") {
+        return consoleAction;
     } else if (action == "forward") {
         return forwardAction;
     } else if (action == "backward") {

src/deps/imgui/imgui.h

@@ -1,4 +1,4 @@
-// ImGui library v1.19 wip
+// ImGui library v1.20
 // See .cpp file for commentary.
 // See ImGui::ShowTestWindow() for sample code.
 // Read 'Programmer guide' in .cpp for notes on how to setup ImGui in your codebase.
@@ -19,6 +19,7 @@ struct ImGuiWindow;
 #include <stdarg.h>         // va_list
 #include <stddef.h>         // ptrdiff_t
 #include <stdlib.h>         // NULL, malloc
+#include <string.h>         // memset, memmove
 
 #ifndef IM_ASSERT
 #include <assert.h>
@@ -170,8 +171,8 @@ namespace ImGui
 
     IMGUI_API void          SetScrollPosHere();                                                 // adjust scrolling position to center into the current cursor position.
     IMGUI_API void          SetKeyboardFocusHere(int offset = 0);                               // focus keyboard on the next widget. Use positive 'offset' to access sub components of a multiple component widget.
-    IMGUI_API void          SetTreeStateStorage(ImGuiStorage* tree);                            // replace tree state storage with our own (if you want to manipulate it yourself, typically clear subsection of it).
-    IMGUI_API ImGuiStorage* GetTreeStateStorage();
+    IMGUI_API void          SetStateStorage(ImGuiStorage* tree);                                // replace tree state storage with our own (if you want to manipulate it yourself, typically clear subsection of it).
+    IMGUI_API ImGuiStorage* GetStateStorage();
 
     IMGUI_API void          PushItemWidth(float item_width);                                    // width of items for the common item+label case. default to ~2/3 of windows width.
     IMGUI_API void          PopItemWidth();
@@ -212,6 +213,7 @@ namespace ImGui
 
     // ID scopes
     // If you are creating repeated widgets in a loop you most likely want to push a unique identifier so ImGui can differentiate them.
+    // You can also use ## within your widget name to distinguish them from each others (see 'Programmer Guide')
     IMGUI_API void          PushID(const char* str_id);                                         // push identifier into the ID stack. IDs are hash of the *entire* stack!
     IMGUI_API void          PushID(const void* ptr_id);
     IMGUI_API void          PushID(const int int_id);
@@ -240,6 +242,9 @@ namespace ImGui
     IMGUI_API bool          SliderFloat4(const char* label, float v[4], float v_min, float v_max, const char* display_format = "%.3f", float power = 1.0f);
     IMGUI_API bool          SliderAngle(const char* label, float* v, float v_degrees_min = -360.0f, float v_degrees_max = +360.0f);     // *v in radians
     IMGUI_API bool          SliderInt(const char* label, int* v, int v_min, int v_max, const char* display_format = "%.0f");
+    IMGUI_API bool          SliderInt2(const char* label, int v[2], int v_min, int v_max, const char* display_format = "%.0f");
+    IMGUI_API bool          SliderInt3(const char* label, int v[3], int v_min, int v_max, const char* display_format = "%.0f");
+    IMGUI_API bool          SliderInt4(const char* label, int v[4], int v_min, int v_max, const char* display_format = "%.0f");
     IMGUI_API void          PlotLines(const char* label, const float* values, int values_count, int values_offset = 0, const char* overlay_text = NULL, float scale_min = FLT_MAX, float scale_max = FLT_MAX, ImVec2 graph_size = ImVec2(0,0), size_t stride = sizeof(float));
     IMGUI_API void          PlotLines(const char* label, float (*values_getter)(void* data, int idx), void* data, int values_count, int values_offset = 0, const char* overlay_text = NULL, float scale_min = FLT_MAX, float scale_max = FLT_MAX, ImVec2 graph_size = ImVec2(0,0));
     IMGUI_API void          PlotHistogram(const char* label, const float* values, int values_count, int values_offset = 0, const char* overlay_text = NULL, float scale_min = FLT_MAX, float scale_max = FLT_MAX, ImVec2 graph_size = ImVec2(0,0), size_t stride = sizeof(float));
@@ -271,7 +276,7 @@ namespace ImGui
     IMGUI_API void          TreePop();
     IMGUI_API void          OpenNextNode(bool open);                                            // force open/close the next TreeNode or CollapsingHeader
 
-    // Value helper output "name: value". tip: freely declare your own within the ImGui namespace!
+    // Value() Helpers: output single value in "name: value" format. Tip: freely declare your own within the ImGui namespace!
     IMGUI_API void          Value(const char* prefix, bool b);
     IMGUI_API void          Value(const char* prefix, int v);
     IMGUI_API void          Value(const char* prefix, unsigned int v);
@@ -279,11 +284,13 @@ namespace ImGui
     IMGUI_API void          Color(const char* prefix, const ImVec4& v);
     IMGUI_API void          Color(const char* prefix, unsigned int v);
 
-    // Logging
-    IMGUI_API void          LogButtons();
-    IMGUI_API void          LogToTTY(int max_depth = -1);
-    IMGUI_API void          LogToFile(int max_depth = -1, const char* filename = NULL);
-    IMGUI_API void          LogToClipboard(int max_depth = -1);
+    // Logging: All text output from your interface are redirected to tty/file/clipboard. Tree nodes are automatically opened.
+    IMGUI_API void          LogToTTY(int max_depth = -1);                                       // start logging to tty
+    IMGUI_API void          LogToFile(int max_depth = -1, const char* filename = NULL);         // start logging to file
+    IMGUI_API void          LogToClipboard(int max_depth = -1);                                 // start logging to OS clipboard
+    IMGUI_API void          LogFinish();                                                        // stop logging (close file, etc.)
+    IMGUI_API void          LogButtons();                                                       // helper to display buttons for logging to tty/file/clipboard
+    IMGUI_API void          LogText(const char* fmt, ...);                                      // pass text data straight to log (without being displayed)
 
     // Utilities
     IMGUI_API bool          IsItemHovered();                                                    // was the last item active area hovered by mouse?
@@ -301,7 +308,7 @@ namespace ImGui
     IMGUI_API ImVec2        GetMousePos();                                                      // shortcut to ImGui::GetIO().MousePos provided by user, to be consistent with other calls
     IMGUI_API float         GetTime();
     IMGUI_API int           GetFrameCount();
-    IMGUI_API const char*   GetStyleColorName(ImGuiCol idx);
+    IMGUI_API const char*   GetStyleColName(ImGuiCol idx);
     IMGUI_API void          GetDefaultFontData(const void** fnt_data, unsigned int* fnt_size, const void** png_data, unsigned int* png_size);
     IMGUI_API ImVec2        CalcTextSize(const char* text, const char* text_end = NULL, bool hide_text_after_double_hash = false, float wrap_width = -1.0f);
 
@@ -380,6 +387,7 @@ enum ImGuiCol_
     ImGuiCol_ComboBg,
     ImGuiCol_CheckHovered,
     ImGuiCol_CheckActive,
+    ImGuiCol_CheckMark,
     ImGuiCol_SliderGrab,
     ImGuiCol_SliderGrabActive,
     ImGuiCol_Button,
@@ -417,7 +425,6 @@ enum ImGuiStyleVar_
     ImGuiStyleVar_ItemSpacing,       // ImVec2
     ImGuiStyleVar_ItemInnerSpacing,  // ImVec2
     ImGuiStyleVar_TreeNodeSpacing,   // float
-    ImGuiStyleVar_ColumnsMinSpacing  // float 
 };
 
 // Enumeration for ColorEditMode()
@@ -443,13 +450,13 @@ struct ImGuiStyle
     float       Alpha;                      // Global alpha applies to everything in ImGui
     ImVec2      WindowPadding;              // Padding within a window
     ImVec2      WindowMinSize;              // Minimum window size
+    float       WindowRounding;             // Radius of window corners rounding. Set to 0.0f to have rectangular windows
     ImVec2      FramePadding;               // Padding within a framed rectangle (used by most widgets)
     ImVec2      ItemSpacing;                // Horizontal and vertical spacing between widgets/lines
     ImVec2      ItemInnerSpacing;           // Horizontal and vertical spacing between within elements of a composed widget (e.g. a slider and its label)
     ImVec2      TouchExtraPadding;          // Expand bounding box for touch-based system where touch position is not accurate enough (unnecessary for mouse inputs). Unfortunately we don't sort widgets so priority on overlap will always be given to the first widget running. So dont grow this too much!
     ImVec2      AutoFitPadding;             // Extra space after auto-fit (double-clicking on resize grip)
     float       WindowFillAlphaDefault;     // Default alpha of window background, if not specified in ImGui::Begin()
-    float       WindowRounding;             // Radius of window corners rounding. Set to 0.0f to have rectangular windows
     float       TreeNodeSpacing;            // Horizontal spacing when entering a tree node
     float       ColumnsMinSpacing;          // Minimum horizontal spacing between two columns
     float       ScrollBarWidth;             // Width of the vertical scroll bar
@@ -604,6 +611,7 @@ struct ImGuiTextBuffer
     bool                empty() { return Buf.empty(); }
     void                clear() { Buf.clear(); Buf.push_back(0); }
     IMGUI_API void      append(const char* fmt, ...);
+    IMGUI_API void      appendv(const char* fmt, va_list args);
 };
 
 // Helper: Key->value storage
@@ -679,7 +687,7 @@ struct ImDrawVert
     ImU32   col;
 };
 #else
-// You can change the vertex format layout by defining IMGUI_OVERRIDE_DRAWVERT_STRUCT_LAYOUT.
+// You can change the vertex format layout by defining IMGUI_OVERRIDE_DRAWVERT_STRUCT_LAYOUT in imconfig.h
 // The code expect ImVec2 pos (8 bytes), ImVec2 uv (8 bytes), ImU32 col (4 bytes), but you can re-order them or add other fields as needed to simplify integration in your engine.
 // The type has to be described by the #define (you can either declare the struct or use a typedef)
 IMGUI_OVERRIDE_DRAWVERT_STRUCT_LAYOUT;
@@ -737,7 +745,7 @@ struct ImFont
 
     // Settings
     float                       Scale;              // = 1.0f          // Base font scale, multiplied by the per-window font scale which you can adjust with SetFontScale()
-    ImVec2                      DisplayOffset;      // = (0.0f,0.0f    // Offset font rendering by xx pixels
+    ImVec2                      DisplayOffset;      // = (0.0f,0.0f)   // Offset font rendering by xx pixels
     ImVec2                      TexUvForWhite;      // = (0.0f,0.0f)   // Font texture must have a white pixel at this UV coordinate. Adjust if you are using custom texture.
     ImWchar                     FallbackChar;       // = '?'           // Replacement glyph is one isn't found.