Merge branch 'develop'

Author: abdes

CMakeLists.txt

@@ -58,7 +58,7 @@ set(META_AUTHOR_DOMAIN       "https://github.com/abdes/asap")
 set(META_AUTHOR_MAINTAINER   "Abdessattar Sassi (abde.sassi gmail account)")
 set(META_VERSION_MAJOR       "0")
 set(META_VERSION_MINOR       "9")
-set(META_VERSION_PATCH       "6")
+set(META_VERSION_PATCH       "7")
 set(META_VERSION_REVISION    "${GIT_REV}")
 set(META_VERSION             "${META_VERSION_MAJOR}.${META_VERSION_MINOR}.${META_VERSION_PATCH}")
 set(META_NAME_VERSION        "${META_PROJECT_NAME} v${META_VERSION} (${META_VERSION_REVISION})")

README.md

@@ -11,13 +11,13 @@
 | Windows                   | [![Windows][21]][20]                  |
 
 [0]: https://travis-ci.org/abdes/asap_app_imgui
-[9]: https://travis-matrix-badges.herokuapp.com/repos/abdes/asap_app_imgui/branches/master/9
-[10]: https://travis-matrix-badges.herokuapp.com/repos/abdes/asap_app_imgui/branches/master/10
-[11]: https://travis-matrix-badges.herokuapp.com/repos/abdes/asap_app_imgui/branches/master/11
-[12]: https://travis-matrix-badges.herokuapp.com/repos/abdes/asap_app_imgui/branches/master/12
-[13]: https://travis-matrix-badges.herokuapp.com/repos/abdes/asap_app_imgui/branches/master/13
+[9]: https://travis-matrix-badges.herokuapp.com/repos/abdes/asap_app_imgui/branches/develop/9
+[10]: https://travis-matrix-badges.herokuapp.com/repos/abdes/asap_app_imgui/branches/develop/10
+[11]: https://travis-matrix-badges.herokuapp.com/repos/abdes/asap_app_imgui/branches/develop/11
+[12]: https://travis-matrix-badges.herokuapp.com/repos/abdes/asap_app_imgui/branches/develop/12
+[13]: https://travis-matrix-badges.herokuapp.com/repos/abdes/asap_app_imgui/branches/develop/13
 [20]: https://ci.appveyor.com/project/abdes/asap-app-imgui
-[21]: https://ci.appveyor.com/api/projects/status/qoaae14rw3cyivgq/branch/master?svg=true
+[21]: https://ci.appveyor.com/api/projects/status/qoaae14rw3cyivgq/branch/develop?svg=true
 
 # Starter project with minimum necessary functionality
 

common

@@ -136,6 +136,13 @@ asap_executable(
   ${compile_options}
 )
 
+# Hacking the include directories when building th executable simply because of 
+# Imgui backend files including "imgui.h" literally like that. We add the imgui 
+# directory to the includes so that it will work.
+#
+# In other files, such as the ones we provide, we don't do that shit like that.
+# Instead, we include files from Imgui library as <imgui/xxxxx>
+target_include_directories(${target} PRIVATE ${CMAKE_SOURCE_DIR}/imgui/imgui)
 
 # ------------------------------------------------------------------------------
 # Tests

imgui

@@ -17,8 +17,8 @@
 #include <GLFW/glfw3.h>
 
 #include <imgui/imgui.h>
-#include <glfw/imgui_impl_glfw.h>
-#include <glfw/imgui_impl_opengl3.h>
+#include <imgui/backends/imgui_impl_glfw.h>
+#include <imgui/backends/imgui_impl_opengl3.h>
 // clang-format on
 
 #include <cpptoml.h>

main/CMakeLists.txt

@@ -43,7 +43,7 @@ class Shader
       vertexCode = vShaderStream.str();
       fragmentCode = fShaderStream.str();
     }
-    catch (std::ifstream::failure e)
+    catch (std::ifstream::failure& e)
     {
       std::cout << "ERROR::SHADER::FILE_NOT_SUCCESFULLY_READ" << std::endl;
     }

main/src/imgui_runner.cpp

@@ -261,7 +261,7 @@ namespace asap {
     }
     ImGui::PopStyleVar();
 
-    if (!scroll_lock_ && scroll_to_bottom_) ImGui::SetScrollHere(1.0f);
+    if (!scroll_lock_ && scroll_to_bottom_) ImGui::SetScrollHereY(1.0f);
     scroll_to_bottom_ = false;
     ImGui::EndChild();
 

main/src/shader.h

@@ -483,7 +483,7 @@ void Theme::LoadDefaultStyle() {
   style.Colors[ImGuiCol_PlotHistogramHovered] = ImVec4(0.00f, 0.40f, 1.00f, 1.00f);
   style.Colors[ImGuiCol_TextSelectedBg] = ImVec4(0.75f, 0.42f, 0.02f, 0.35f);
   style.Colors[ImGuiCol_PopupBg] = ImVec4(0.00f, 0.00f, 0.00f, 0.94f);
-  style.Colors[ImGuiCol_ModalWindowDarkening] = ImVec4(0.06f, 0.06f, 0.06f, 0.35f);
+  style.Colors[ImGuiCol_ModalWindowDimBg] = ImVec4(0.06f, 0.06f, 0.06f, 0.35f);
   // clang-format on
 }