Using C++11 std::chrono for utils/time

ChangeLog.md

@@ -2,6 +2,10 @@
 
 ## OpenRaider (0.1.3) xythobuz <xythobuz@xythobuz.de>
 
+    [ 20140909 ]
+    * utils/time now using std::chrono (C++11) for single cross-plattform implementation
+    * Updated imgui (my pull request was merged)
+
     [ 20140908 ]
     * Moved imgui Console into own (static) class
     * Added FPS display

include/config.h.in

@@ -31,8 +31,5 @@ extern const char *BUILD_HOST;
 #cmakedefine HAVE_STDLIB_H
 #cmakedefine HAVE_GETENV
 
-#cmakedefine HAVE_SYS_TIME_H
-#cmakedefine HAVE_GETTIMEOFDAY
-
 #endif
 

include/utils/time.h

@@ -8,8 +8,6 @@
 #ifndef _UTILS_TIME_H_
 #define _UTILS_TIME_H_
 
-extern unsigned long systemTimerStart;
-
 /*!
  * \brief Read the system timer
  * \returns number of ticks

src/CMakeLists.txt

@@ -132,10 +132,6 @@ check_function_exists (getcwd HAVE_GETCWD)
 check_include_files (stdlib.h HAVE_STDLIB_H)
 check_function_exists (getenv HAVE_GETENV)
 
-# gettimeofday() for timing
-check_include_files (sys/time.h HAVE_SYS_TIME_H)
-check_function_exists (gettimeofday HAVE_GETTIMEOFDAY)
-
 #################################################################
 
 # Configuration Header file

src/Console.cpp

@@ -32,9 +32,8 @@ void Console::display() {
         }
         ImGui::EndChild();
 
-        bool enter = false;
-        ImGui::InputText("Command", buffer, bufferLength, ImGuiInputTextFlags_AutoSelectAll, &enter);
-        if (enter) {
+        if (ImGui::InputText("Command", buffer, bufferLength,
+                    ImGuiInputTextFlags_AutoSelectAll | ImGuiInputTextFlags_EnterReturnsTrue)) {
             getLog() << "> " << buffer << Log::endl;
             int error = Command::command(buffer);
             if (error != 0) {

src/UI.cpp

@@ -172,8 +172,12 @@ void UI::display() {
 
     Console::display();
 
-    if (ImGui::Begin("Engine")) {
-        if (ImGui::CollapsingHeader("Debug", NULL, true, true)) {
+    if (ImGui::Begin("Engine/RT")) {
+        if (ImGui::CollapsingHeader("Engine", NULL, true, true)) {
+            ImGui::Text("Uptime: %lums", systemTimerGet());
+        }
+
+        if (ImGui::CollapsingHeader("Debug")) {
 
         }
 

src/deps/imgui/imgui.cpp

@@ -162,7 +162,6 @@
  - text edit: flag to disable live update of the user buffer. 
  - text edit: field resize behaviour - field could stretch when being edited? hover tooltip shows more text?
  - text edit: pasting text into a number box should filter the characters the same way direct input does
- - text edit: allow code to catch user pressing Return (perhaps through disable live edit? so only Return apply the final value, also allow catching Return if value didn't changed)
  - settings: write more decent code to allow saving/loading new fields
  - settings: api for per-tool simple persistant data (bool,int,float) in .ini file
  - log: be able to right-click and log a window or tree-node into tty/file/clipboard?
@@ -3280,7 +3279,7 @@ bool SliderFloat(const char* label, float* v, float v_min, float v_max, const ch
         g.ActiveId = g.SliderAsInputTextId;
         g.HoveredId = 0;
         window->FocusItemUnregister();      // Our replacement slider will override the focus ID (that we needed to declare previously to allow for a TAB focus to happen before we got selected)
-        value_changed = ImGui::InputText(label, text_buf, IM_ARRAYSIZE(text_buf), ImGuiInputTextFlags_CharsDecimal | ImGuiInputTextFlags_AutoSelectAll | ImGuiInputTextFlags_AlignCenter);
+        value_changed = ImGui::InputText(label, text_buf, IM_ARRAYSIZE(text_buf), ImGuiInputTextFlags_CharsDecimal | ImGuiInputTextFlags_AutoSelectAll);
         if (g.SliderAsInputTextId == 0)
         {
             // First frame
@@ -3835,7 +3834,7 @@ void ImGuiTextEditState::RenderTextScrolledClipped(ImFont font, float font_size,
 namespace ImGui
 {
 
-bool InputFloat(const char* label, float *v, float step, float step_fast, int decimal_precision)
+bool InputFloat(const char* label, float *v, float step, float step_fast, int decimal_precision, ImGuiInputTextFlags extra_flags)
 {
     ImGuiState& g = GImGui;
     ImGuiWindow* window = GetCurrentWindow();
@@ -3858,7 +3857,8 @@ bool InputFloat(const char* label, float *v, float step, float step_fast, int de
     else
         ImFormatString(buf, IM_ARRAYSIZE(buf), "%.*f", decimal_precision, *v);
     bool value_changed = false;
-    if (ImGui::InputText("", buf, IM_ARRAYSIZE(buf), ImGuiInputTextFlags_CharsDecimal|ImGuiInputTextFlags_AlignCenter|ImGuiInputTextFlags_AutoSelectAll))
+	const ImGuiInputTextFlags flags = extra_flags | (ImGuiInputTextFlags_CharsDecimal|ImGuiInputTextFlags_AutoSelectAll);
+    if (ImGui::InputText("", buf, IM_ARRAYSIZE(buf), flags))
     {
         ApplyNumericalTextInput(buf, v);
         value_changed = true;
@@ -3892,19 +3892,16 @@ bool InputFloat(const char* label, float *v, float step, float step_fast, int de
     return value_changed;
 }
 
-bool InputInt(const char* label, int *v, int step, int step_fast)
+bool InputInt(const char* label, int *v, int step, int step_fast, ImGuiInputTextFlags extra_flags)
 {
     float f = (float)*v;
-    const bool value_changed = ImGui::InputFloat(label, &f, (float)step, (float)step_fast, 0);
+    const bool value_changed = ImGui::InputFloat(label, &f, (float)step, (float)step_fast, 0, extra_flags);
     *v = (int)f;
     return value_changed;
 }
 
-bool InputText(const char* label, char* buf, size_t buf_size, ImGuiInputTextFlags flags, bool *enter)
+bool InputText(const char* label, char* buf, size_t buf_size, ImGuiInputTextFlags flags)
 {
-    if (enter != NULL)
-        *enter = false;
-
     ImGuiState& g = GImGui;
     ImGuiWindow* window = GetCurrentWindow();
     if (window->SkipItems)
@@ -3965,6 +3962,7 @@ bool InputText(const char* label, char* buf, size_t buf_size, ImGuiInputTextFlag
 
     bool value_changed = false;
     bool cancel_edit = false;
+    bool enter_pressed = false;
     if (g.ActiveId == id)
     {
 		// Edit in progress
@@ -4004,7 +4002,7 @@ bool InputText(const char* label, char* buf, size_t buf_size, ImGuiInputTextFlag
         else if (IsKeyPressedMap(ImGuiKey_End))                 edit_state.OnKeyboardPressed(is_ctrl_down ? STB_TEXTEDIT_K_TEXTEND | k_mask : STB_TEXTEDIT_K_LINEEND | k_mask);
         else if (IsKeyPressedMap(ImGuiKey_Delete))              edit_state.OnKeyboardPressed(STB_TEXTEDIT_K_DELETE | k_mask);
         else if (IsKeyPressedMap(ImGuiKey_Backspace))           edit_state.OnKeyboardPressed(STB_TEXTEDIT_K_BACKSPACE | k_mask);
-        else if (IsKeyPressedMap(ImGuiKey_Enter))               { g.ActiveId = 0; if (enter != NULL) *enter = true; }
+        else if (IsKeyPressedMap(ImGuiKey_Enter))               { g.ActiveId = 0; enter_pressed = true; }
         else if (IsKeyPressedMap(ImGuiKey_Escape))              { g.ActiveId = 0; cancel_edit = true; }
         else if (is_ctrl_down && IsKeyPressedMap(ImGuiKey_Z))   edit_state.OnKeyboardPressed(STB_TEXTEDIT_K_UNDO);      // I don't want to use shortcuts but we should probably have an Input-catch stack
         else if (is_ctrl_down && IsKeyPressedMap(ImGuiKey_Y))   edit_state.OnKeyboardPressed(STB_TEXTEDIT_K_REDO);
@@ -4125,7 +4123,10 @@ bool InputText(const char* label, char* buf, size_t buf_size, ImGuiInputTextFlag
 
     RenderText(ImVec2(frame_bb.Max.x + style.ItemInnerSpacing.x, frame_bb.Min.y + style.FramePadding.y), label);
 
-    return value_changed;
+    if ((flags & ImGuiInputTextFlags_EnterReturnsTrue) != 0)
+        return enter_pressed;
+    else
+        return value_changed;
 }
 
 static bool InputFloatN(const char* label, float* v, int components, int decimal_precision)
@@ -5871,7 +5872,7 @@ void ShowTestWindow(bool* open)
         bool goto_line = ImGui::Button("Goto");
         ImGui::SameLine(); 
         ImGui::PushItemWidth(100);
-        ImGui::InputInt("##Line", &line, 0); 
+        goto_line |= ImGui::InputInt("##Line", &line, 0, 0, ImGuiInputTextFlags_EnterReturnsTrue);
         ImGui::PopItemWidth();
         ImGui::BeginChild("Sub1", ImVec2(ImGui::GetWindowWidth()*0.5f,300));
         for (int i = 0; i < 100; i++)

src/deps/imgui/imgui.h

@@ -215,12 +215,12 @@ namespace ImGui
     bool        CheckboxFlags(const char* label, unsigned int* flags, unsigned int flags_value);
     bool        RadioButton(const char* label, bool active);
     bool        RadioButton(const char* label, int* v, int v_button);
-    bool        InputFloat(const char* label, float* v, float step = 0.0f, float step_fast = 0.0f, int decimal_precision = -1);
+    bool        InputText(const char* label, char* buf, size_t buf_size, ImGuiInputTextFlags flags = 0);
+    bool        InputFloat(const char* label, float* v, float step = 0.0f, float step_fast = 0.0f, int decimal_precision = -1, ImGuiInputTextFlags extra_flags = 0);
     bool        InputFloat2(const char* label, float v[2], int decimal_precision = -1);
     bool        InputFloat3(const char* label, float v[3], int decimal_precision = -1);
     bool        InputFloat4(const char* label, float v[4], int decimal_precision = -1);
-    bool        InputInt(const char* label, int* v, int step = 1, int step_fast = 100);
-    bool        InputText(const char* label, char* buf, size_t buf_size, ImGuiInputTextFlags flags = 0, bool* enter = NULL);
+    bool        InputInt(const char* label, int* v, int step = 1, int step_fast = 100, ImGuiInputTextFlags extra_flags = 0);
     bool        Combo(const char* label, int* current_item, const char** items, int items_count, int popup_height_items = 7);
     bool        Combo(const char* label, int* current_item, const char* items_separated_by_zeros, int popup_height_items = 7);      // Separate items with \0, end item-list with \0\0
     bool        Combo(const char* label, int* current_item, bool (*items_getter)(void* data, int idx, const char** out_text), void* data, int items_count, int popup_height_items = 7);
@@ -292,8 +292,9 @@ enum ImGuiInputTextFlags_
     // Default: 0
     ImGuiInputTextFlags_CharsDecimal        = 1 << 0,   // Allow 0123456789.+-*/
     ImGuiInputTextFlags_CharsHexadecimal    = 1 << 1,   // Allow 0123456789ABCDEFabcdef
-    ImGuiInputTextFlags_AutoSelectAll       = 1 << 2,
-    ImGuiInputTextFlags_AlignCenter         = 1 << 3,
+    ImGuiInputTextFlags_AutoSelectAll       = 1 << 2,   // Select entire text when first taking focus
+    ImGuiInputTextFlags_EnterReturnsTrue    = 1 << 3,   // Return 'true' when Enter is pressed (as opposed to when the value was modified)
+    //ImGuiInputTextFlags_AlignCenter       = 1 << 3,
 };
 
 // User fill ImGuiIO.KeyMap[] array with indices into the ImGuiIO.KeysDown[512] array

src/utils/time.cpp

@@ -5,42 +5,24 @@
  * \author xythobuz
  */
 
+#include <chrono>
+
 #include "global.h"
 #include "utils/time.h"
 
-unsigned long systemTimerStart = 0;
-
-#if defined(HAVE_SYS_TIME_H) && defined(HAVE_GETTIMEOFDAY)
-
-#include <sys/time.h>
-
-unsigned long systemTimerGet() {
-    struct timeval time;
-    struct timezone zone;
-    gettimeofday(&time, &zone);
-    return ((time.tv_sec * 1000) + (time.tv_usec / 1000)) - systemTimerStart;
-}
-
-void systemTimerReset() {
-    struct timeval time;
-    struct timezone zone;
-    gettimeofday(&time, &zone);
-    systemTimerStart = (time.tv_sec * 1000) + (time.tv_usec / 1000);
-}
-
-#elif defined(_WIN32)
-
-#include <Windows.h>
+static unsigned long systemTimerStart = 0;
 
 unsigned long systemTimerGet() {
-    return GetTickCount() - systemTimerStart;
+    auto tp = std::chrono::steady_clock::now();
+    auto dtn = tp.time_since_epoch();
+    return (dtn.count() * 1000 * std::chrono::steady_clock::period::num
+            / std::chrono::steady_clock::period::den) - systemTimerStart;
 }
 
 void systemTimerReset() {
-    systemTimerStart = GetTickCount();
+    auto tp = std::chrono::steady_clock::now();
+    auto dtn = tp.time_since_epoch();
+    systemTimerStart = dtn.count() * 1000 * std::chrono::steady_clock::period::num
+            / std::chrono::steady_clock::period::den;
 }
 
-#else
-#error "No support for timer on this platform!"
-#endif
-