nmwsharp · weshoke · Aug 16, 2024 · Aug 16, 2024 · Aug 18, 2024
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.5...3.22)
+cmake_minimum_required(VERSION 3.12...3.22)
 
 project(polyscope)
 

diff --git a/deps/imgui/CMakeLists.txt b/deps/imgui/CMakeLists.txt
@@ -19,7 +19,16 @@ endif()
 
 if("${POLYSCOPE_BACKEND_OPENGL3_GLFW}")
 
-  set(SRCS imgui/imgui.cpp imgui/imgui_draw.cpp imgui/imgui_tables.cpp imgui/imgui_widgets.cpp imgui/imgui_demo.cpp imgui/backends/imgui_impl_glfw.cpp imgui/backends/imgui_impl_opengl3.cpp)
+  set(SRCS
+    imgui/imgui.cpp
+    imgui/imgui_draw.cpp
+    imgui/imgui_tables.cpp
+    imgui/imgui_widgets.cpp
+    imgui/imgui_demo.cpp
+    imgui/backends/imgui_impl_glfw.cpp
+    imgui/backends/imgui_impl_opengl3.cpp
+    imgui/misc/cpp/imgui_stdlib.cpp
+  )
 
   add_library(
           imgui

diff --git a/deps/imgui/imgui b/deps/imgui/imgui
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -362,7 +362,7 @@ install(TARGETS polyscope)
 install(DIRECTORY ${INCLUDE_ROOT}/ DESTINATION "${CMAKE_INSTALL_PREFIX}/include/polyscope")
 
 # Required compiler settings
-set_property(TARGET polyscope PROPERTY CXX_STANDARD 11)
+set_property(TARGET polyscope PROPERTY CXX_STANDARD 17)
 set_property(TARGET polyscope PROPERTY CXX_STANDARD_REQUIRED TRUE)
 set_target_properties(polyscope PROPERTIES POSITION_INDEPENDENT_CODE TRUE)
 add_definitions(-DNOMINMAX)

diff --git a/src/imgui_config.cpp b/src/imgui_config.cpp
@@ -68,7 +68,7 @@ void configureImGuiStyle() {
   colors[ImGuiCol_DragDropTarget] = ImVec4(1.00f, 1.00f, 0.00f, 0.90f);
   colors[ImGuiCol_Tab] = ImVec4(0.27f, 0.54f, 0.42f, 0.83f);
   colors[ImGuiCol_TabHovered] = ImVec4(0.34f, 0.68f, 0.53f, 0.83f);
-  colors[ImGuiCol_TabActive] = ImVec4(0.38f, 0.76f, 0.58f, 0.83f);
+  colors[ImGuiCol_TabSelected] = ImVec4(0.38f, 0.76f, 0.58f, 0.83f);
 }
+1 −1		.github/FUNDING.yml
+2 −2		.github/workflows/build.yml
+3 −1		.gitignore
+6 −4		backends/imgui_impl_allegro5.cpp
+1 −0		backends/imgui_impl_allegro5.h
+2 −0		backends/imgui_impl_android.cpp
+1 −0		backends/imgui_impl_android.h
+2 −1		backends/imgui_impl_dx10.cpp
+1 −0		backends/imgui_impl_dx10.h
+2 −1		backends/imgui_impl_dx11.cpp
+1 −0		backends/imgui_impl_dx11.h
+2 −1		backends/imgui_impl_dx12.cpp
+2 −0		backends/imgui_impl_dx12.h
+2 −1		backends/imgui_impl_dx9.cpp
+1 −0		backends/imgui_impl_dx9.h
+59 −27		backends/imgui_impl_glfw.cpp
+4 −2		backends/imgui_impl_glfw.h
+1 −0		backends/imgui_impl_glut.cpp
+1 −0		backends/imgui_impl_glut.h
+2 −0		backends/imgui_impl_metal.h
+5 −3		backends/imgui_impl_metal.mm
+5 −1		backends/imgui_impl_opengl2.cpp
+1 −0		backends/imgui_impl_opengl2.h
+29 −24		backends/imgui_impl_opengl3.cpp
+4 −4		backends/imgui_impl_opengl3.h
+110 −16		backends/imgui_impl_opengl3_loader.h
+2 −0		backends/imgui_impl_osx.h
+13 −6		backends/imgui_impl_osx.mm
+32 −15		backends/imgui_impl_sdl2.cpp
+1 −0		backends/imgui_impl_sdl2.h
+135 −96		backends/imgui_impl_sdl3.cpp
+3 −3		backends/imgui_impl_sdl3.h
+21 −23		backends/imgui_impl_sdlrenderer2.cpp
+2 −1		backends/imgui_impl_sdlrenderer2.h
+45 −24		backends/imgui_impl_sdlrenderer3.cpp
+2 −1		backends/imgui_impl_sdlrenderer3.h
+12 −9		backends/imgui_impl_vulkan.cpp
+10 −3		backends/imgui_impl_vulkan.h
+2 −1		backends/imgui_impl_wgpu.cpp
+2 −1		backends/imgui_impl_wgpu.h
+51 −29		backends/imgui_impl_win32.cpp
+1 −0		backends/imgui_impl_win32.h
+21 −21		docs/BACKENDS.md
+512 −9		docs/CHANGELOG.txt
+10 −43		docs/EXAMPLES.md
+38 −6		docs/FAQ.md
+12 −10		docs/README.md
+8 −10		docs/TODO.txt
+1 −1		examples/example_android_opengl3/android/app/src/main/AndroidManifest.xml
+1 −1		examples/example_android_opengl3/main.cpp
+1 −1		examples/example_glfw_opengl3/main.cpp
+24 −17		examples/example_glfw_vulkan/main.cpp
+113 −0		examples/example_glfw_wgpu/CMakeLists.txt
+0 −0		examples/example_glfw_wgpu/Makefile.emscripten
+2 −2		examples/example_glfw_wgpu/README.md
+84 −19		examples/example_glfw_wgpu/main.cpp
+5 −1		examples/example_glfw_wgpu/web/index.html
+1 −1		examples/example_sdl2_sdlrenderer2/main.cpp
+24 −17		examples/example_sdl2_vulkan/main.cpp
+3 −3		examples/example_sdl3_opengl3/Makefile
+1 −4		examples/example_sdl3_opengl3/main.cpp
+3 −3		examples/example_sdl3_sdlrenderer3/Makefile
+4 −6		examples/example_sdl3_sdlrenderer3/main.cpp
+14 −2		examples/example_win32_directx10/main.cpp
+13 −2		examples/example_win32_directx11/main.cpp
+15 −2		examples/example_win32_directx12/main.cpp
+18 −4		examples/example_win32_directx9/main.cpp
+20 −0		examples/imgui_examples.sln
+1 −1		examples/libs/usynergy/uSynergy.h
+9 −4		imconfig.h
+1,160 −624		imgui.cpp
+541 −206		imgui.h
+2,191 −433		imgui_demo.cpp
+354 −30		imgui_draw.cpp
+382 −252		imgui_internal.h
+149 −77		imgui_tables.cpp
+1,497 −295		imgui_widgets.cpp
+1 −1		imstb_textedit.h
+1 −1		imstb_truetype.h
+2 −2		misc/freetype/imgui_freetype.cpp