From 492d6c282657892e142e21631cf2aa1ff55e269f Mon Sep 17 00:00:00 2001
From: Peter Johnson <johnson.peter@gmail.com>
Date: Sat, 27 Jun 2020 16:02:40 -0700
Subject: [PATCH] [sim] Update thirdparty-imgui (#2552)

Updates the following dependencies:
- glfw to latest 3.3-stable
- imgui to 1.76
- stb to latest master

Removes libvulkan dependency.

Also adds implot.
---
 imgui/CMakeLists.txt               |  6 ++++--
 imgui/CMakeLists.txt.in            | 16 +++++++++++++---
 shared/config.gradle               |  2 +-
 simulation/halsim_gui/build.gradle |  2 +-
 4 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/imgui/CMakeLists.txt b/imgui/CMakeLists.txt
index b64cc6767f..1bfb7ab3bd 100644
--- a/imgui/CMakeLists.txt
+++ b/imgui/CMakeLists.txt
@@ -51,8 +51,10 @@ add_subdirectory(${CMAKE_CURRENT_BINARY_DIR}/gl3w-src
 
 set(imgui_srcdir ${CMAKE_CURRENT_BINARY_DIR}/imgui-src)
 file(GLOB imgui_sources ${imgui_srcdir}/*.cpp)
-add_library(imgui STATIC ${imgui_sources} ${imgui_srcdir}/examples/imgui_impl_glfw.cpp ${imgui_srcdir}/examples/imgui_impl_opengl3.cpp ${CMAKE_CURRENT_BINARY_DIR}/imgui_ProggyDotted.cpp ${CMAKE_CURRENT_BINARY_DIR}/stb_image.cpp)
+set(implot_srcdir ${CMAKE_CURRENT_BINARY_DIR}/implot-src)
+file(GLOB implot_sources ${implot_srcdir}/*.cpp)
+add_library(imgui STATIC ${imgui_sources} ${implot_sources} ${imgui_srcdir}/examples/imgui_impl_glfw.cpp ${imgui_srcdir}/examples/imgui_impl_opengl3.cpp ${CMAKE_CURRENT_BINARY_DIR}/imgui_ProggyDotted.cpp ${CMAKE_CURRENT_BINARY_DIR}/stb_image.cpp)
 target_link_libraries(imgui PUBLIC gl3w glfw)
-target_include_directories(imgui PUBLIC "$<BUILD_INTERFACE:${imgui_srcdir}>" "$<BUILD_INTERFACE:${imgui_srcdir}/examples>" "$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>" "$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/stb-src>")
+target_include_directories(imgui PUBLIC "$<BUILD_INTERFACE:${imgui_srcdir}>" "$<BUILD_INTERFACE:${implot_srcdir}>" "$<BUILD_INTERFACE:${imgui_srcdir}/examples>" "$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>" "$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/stb-src>")
 
 set_property(TARGET imgui PROPERTY POSITION_INDEPENDENT_CODE ON)
diff --git a/imgui/CMakeLists.txt.in b/imgui/CMakeLists.txt.in
index 48714eb620..076d95a7b6 100644
--- a/imgui/CMakeLists.txt.in
+++ b/imgui/CMakeLists.txt.in
@@ -5,7 +5,7 @@ project(imgui-download NONE)
 include(ExternalProject)
 ExternalProject_Add(glfw3
   GIT_REPOSITORY    https://github.com/glfw/glfw.git
-  GIT_TAG           7105ff2dfd004a46bd732c1d0c9f461bae6d51b3
+  GIT_TAG           63af05c41961c238c2f891e2c923e1b89c1271b6
   SOURCE_DIR        "${CMAKE_CURRENT_BINARY_DIR}/glfw-src"
   BINARY_DIR        "${CMAKE_CURRENT_BINARY_DIR}/glfw-build"
   CONFIGURE_COMMAND ""
@@ -23,7 +23,7 @@ ExternalProject_Add(gl3w
 )
 ExternalProject_Add(imgui
   GIT_REPOSITORY    https://github.com/ocornut/imgui.git
-  GIT_TAG           v1.72b
+  GIT_TAG           v1.76
   SOURCE_DIR        "${CMAKE_CURRENT_BINARY_DIR}/imgui-src"
   BINARY_DIR        "${CMAKE_CURRENT_BINARY_DIR}/imgui-build"
   CONFIGURE_COMMAND ""
@@ -31,6 +31,16 @@ ExternalProject_Add(imgui
   INSTALL_COMMAND   ""
   TEST_COMMAND      ""
 )
+ExternalProject_Add(implot
+  GIT_REPOSITORY    https://github.com/epezent/implot.git
+  GIT_TAG           4d4cac629b0edcda6f8d99d5f34225a7d0878509
+  SOURCE_DIR        "${CMAKE_CURRENT_BINARY_DIR}/implot-src"
+  BINARY_DIR        "${CMAKE_CURRENT_BINARY_DIR}/implot-build"
+  CONFIGURE_COMMAND ""
+  BUILD_COMMAND     ""
+  INSTALL_COMMAND   ""
+  TEST_COMMAND      ""
+)
 ExternalProject_Add(proggyfonts
   GIT_REPOSITORY    https://github.com/bluescan/proggyfonts.git
   GIT_TAG           v1.1.5
@@ -43,7 +53,7 @@ ExternalProject_Add(proggyfonts
 )
 ExternalProject_Add(stb
   GIT_REPOSITORY    https://github.com/nothings/stb.git
-  GIT_TAG           f67165c2bb2af3060ecae7d20d6f731173485ad0
+  GIT_TAG           f54acd4e13430c5122cab4ca657705c84aa61b08
   SOURCE_DIR        "${CMAKE_CURRENT_BINARY_DIR}/stb-src"
   BINARY_DIR        "${CMAKE_CURRENT_BINARY_DIR}/stb-build"
   CONFIGURE_COMMAND ""
diff --git a/shared/config.gradle b/shared/config.gradle
index 4c9abe7f35..bdd50d4ec9 100644
--- a/shared/config.gradle
+++ b/shared/config.gradle
@@ -11,7 +11,7 @@ nativeUtils {
       niLibVersion = "2020.10.1"
       opencvVersion = "3.4.7-3"
       googleTestVersion = "1.9.0-4-437e100-1"
-      imguiVersion = "1.72b-4"
+      imguiVersion = "1.76-2"
     }
   }
 }
diff --git a/simulation/halsim_gui/build.gradle b/simulation/halsim_gui/build.gradle
index 49a2f49d93..5e4b9dc96b 100644
--- a/simulation/halsim_gui/build.gradle
+++ b/simulation/halsim_gui/build.gradle
@@ -33,7 +33,7 @@ if (!project.hasProperty('onlylinuxathena') && !project.hasProperty('onlylinuxra
                 } else if (it.targetPlatform.operatingSystem.isMacOsX()) {
                     it.linker.args << '-framework' << 'Cocoa' << '-framework' << 'IOKit' << '-framework' << 'CoreFoundation' << '-framework' << 'CoreVideo'
                 } else {
-                    it.linker.args << '-lX11' << '-lvulkan'
+                    it.linker.args << '-lX11'
                 }
             }
         }