From a4c970b4a44d456b06dddc5bd311795c1e9d9d91 Mon Sep 17 00:00:00 2001 From: Giorgio Gori Date: Mon, 25 Nov 2024 10:08:48 -0800 Subject: [PATCH 1/3] updated to 1.90.9 --- src/imgui_config.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/imgui_config.cpp b/src/imgui_config.cpp index bc6df1431..7b87f0002 100644 --- 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); } From b4d9cf02263537c4c8f4b47f157f6001309e20c2 Mon Sep 17 00:00:00 2001 From: Giorgio Gori Date: Mon, 25 Nov 2024 10:09:27 -0800 Subject: [PATCH 2/3] updated to v1.91.4 --- include/polyscope/render/engine.h | 2 +- include/polyscope/render/mock_opengl/mock_gl_engine.h | 2 +- include/polyscope/render/opengl/gl_engine.h | 2 +- src/render/mock_opengl/mock_gl_engine.cpp | 2 +- src/render/opengl/gl_engine.cpp | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/include/polyscope/render/engine.h b/include/polyscope/render/engine.h index 8c66931aa..d1df2f41d 100644 --- a/include/polyscope/render/engine.h +++ b/include/polyscope/render/engine.h @@ -193,7 +193,7 @@ class TextureBuffer { // bool withAlpha = true, bool useMipMap = false, bool repeat = false); // used to interop with external things, e.g. ImGui - virtual void* getNativeHandle() = 0; + virtual ImTextureID getNativeHandle() = 0; virtual uint32_t getNativeBufferID() = 0; protected: diff --git a/include/polyscope/render/mock_opengl/mock_gl_engine.h b/include/polyscope/render/mock_opengl/mock_gl_engine.h index 360e06a46..2dc4e11cc 100644 --- a/include/polyscope/render/mock_opengl/mock_gl_engine.h +++ b/include/polyscope/render/mock_opengl/mock_gl_engine.h @@ -127,7 +127,7 @@ class GLTextureBuffer : public TextureBuffer { void setData(const std::vector>& data) override; void setFilterMode(FilterMode newMode) override; - void* getNativeHandle() override; + ImTextureID getNativeHandle() override; uint32_t getNativeBufferID() override; std::vector getDataScalar() override; diff --git a/include/polyscope/render/opengl/gl_engine.h b/include/polyscope/render/opengl/gl_engine.h index ba57b9bd1..5d98a412d 100644 --- a/include/polyscope/render/opengl/gl_engine.h +++ b/include/polyscope/render/opengl/gl_engine.h @@ -159,7 +159,7 @@ class GLTextureBuffer : public TextureBuffer { void setData(const std::vector>& data) override; void setFilterMode(FilterMode newMode) override; - void* getNativeHandle() override; + ImTextureID getNativeHandle() override; uint32_t getNativeBufferID() override; std::vector getDataScalar() override; diff --git a/src/render/mock_opengl/mock_gl_engine.cpp b/src/render/mock_opengl/mock_gl_engine.cpp index 6b33aef2b..f575a5025 100644 --- a/src/render/mock_opengl/mock_gl_engine.cpp +++ b/src/render/mock_opengl/mock_gl_engine.cpp @@ -485,7 +485,7 @@ void GLTextureBuffer::setFilterMode(FilterMode newMode) { checkGLError(); } -void* GLTextureBuffer::getNativeHandle() { return nullptr; } +ImTextureID GLTextureBuffer::getNativeHandle() { return 0; } uint32_t GLTextureBuffer::getNativeBufferID() { return 77; }; std::vector GLTextureBuffer::getDataScalar() { diff --git a/src/render/opengl/gl_engine.cpp b/src/render/opengl/gl_engine.cpp index 477cdac9e..ddddc1f68 100644 --- a/src/render/opengl/gl_engine.cpp +++ b/src/render/opengl/gl_engine.cpp @@ -711,7 +711,7 @@ void GLTextureBuffer::setFilterMode(FilterMode newMode) { checkGLError(); } -void* GLTextureBuffer::getNativeHandle() { return reinterpret_cast(getHandle()); } +ImTextureID GLTextureBuffer::getNativeHandle() { return getHandle(); } uint32_t GLTextureBuffer::getNativeBufferID() { return static_cast(getHandle()); }; From fc4046ee65d05cf30a2160d09eef484d1d06a363 Mon Sep 17 00:00:00 2001 From: Giorgio Gori Date: Mon, 25 Nov 2024 10:10:14 -0800 Subject: [PATCH 3/3] updated imgui dependency to v1.91.5 --- deps/imgui/imgui | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deps/imgui/imgui b/deps/imgui/imgui index 277ae93c4..f401021d5 160000 --- a/deps/imgui/imgui +++ b/deps/imgui/imgui @@ -1 +1 @@ -Subproject commit 277ae93c41314ba5f4c7444f37c4319cdf07e8cf +Subproject commit f401021d5a5d56fe2304056c391e78f81c8d4b8f