[imguizmo] update to 1.9 (#51562)

2026-05-06 04:47:01 +09:00 · 2026-05-06 04:47:01 +09:00 · 45e42d5879
parent f910fe75d5
commit 45e42d5879
6 changed files with 90 additions and 176 deletions
--- a/ports/imguizmo/CMakeLists.txt
+++ b/ports/imguizmo/CMakeLists.txt
@ -1,58 +1,58 @@
-cmake_minimum_required(VERSION 3.8)
-project(imguizmo)
-
-set(CMAKE_CXX_STANDARD 11)
-
-find_package(imgui CONFIG REQUIRED)
-get_target_property(IMGUI_INCLUDE_DIRS imgui::imgui
-    INTERFACE_INCLUDE_DIRECTORIES
-)
-
-add_library(${PROJECT_NAME} "")
-
-target_include_directories(
-	${PROJECT_NAME}
-	PUBLIC
-	   	$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
-		$<INSTALL_INTERFACE:include>
-	PRIVATE
-		${IMGUI_INCLUDE_DIRS}
-)
-
-target_sources(
-    ${PROJECT_NAME}
-    PRIVATE
-        GraphEditor.cpp
-        ImCurveEdit.cpp
-        ImGradient.cpp
-        ImGuizmo.cpp
-        ImSequencer.cpp
-)
-
-install(
-    TARGETS ${PROJECT_NAME}
-    EXPORT ${PROJECT_NAME}-target
-    ARCHIVE DESTINATION lib
-    ARCHIVE DESTINATION lib
-    RUNTIME DESTINATION bin
-)
-
-if (NOT IMGUIZMO_SKIP_HEADERS)
-    install(
-        FILES
-            GraphEditor.h
-            ImCurveEdit.h
-            ImGradient.h
-            ImGuizmo.h
-            ImSequencer.h
-            ImZoomSlider.h
-        DESTINATION include
-    )
-endif()
-
-install(
-    EXPORT ${PROJECT_NAME}-target
-    NAMESPACE ${PROJECT_NAME}::
-    FILE ${PROJECT_NAME}-config.cmake
-    DESTINATION share/${PROJECT_NAME}
-)
+cmake_minimum_required(VERSION 3.8)
+project(imguizmo)
+
+set(CMAKE_CXX_STANDARD 11)
+
+find_package(imgui CONFIG REQUIRED)
+get_target_property(IMGUI_INCLUDE_DIRS imgui::imgui
+    INTERFACE_INCLUDE_DIRECTORIES
+)
+
+add_library(${PROJECT_NAME} "")
+
+target_include_directories(
+	${PROJECT_NAME}
+	PUBLIC
+	   	$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
+		$<INSTALL_INTERFACE:include>
+	PRIVATE
+		${IMGUI_INCLUDE_DIRS}
+)
+
+target_sources(
+    ${PROJECT_NAME}
+    PRIVATE
+        src/GraphEditor.cpp
+        src/ImCurveEdit.cpp
+        src/ImGradient.cpp
+        src/ImGuizmo.cpp
+        src/ImSequencer.cpp
+)
+
+install(
+    TARGETS ${PROJECT_NAME}
+    EXPORT ${PROJECT_NAME}-target
+    ARCHIVE DESTINATION lib
+    ARCHIVE DESTINATION lib
+    RUNTIME DESTINATION bin
+)
+
+if (NOT IMGUIZMO_SKIP_HEADERS)
+    install(
+        FILES
+            src/GraphEditor.h
+            src/ImCurveEdit.h
+            src/ImGradient.h
+            src/ImGuizmo.h
+            src/ImSequencer.h
+            src/ImZoomSlider.h
+        DESTINATION include
+    )
+endif()
+
+install(
+    EXPORT ${PROJECT_NAME}-target
+    NAMESPACE ${PROJECT_NAME}::
+    FILE ${PROJECT_NAME}-config.cmake
+    DESTINATION share/${PROJECT_NAME}
+)
--- a/ports/imguizmo/fix-imgui-1.92.5.patch
+++ b/ports/imguizmo/fix-imgui-1.92.5.patch
@ -1,88 +0,0 @@
-diff --git a/GraphEditor.cpp b/GraphEditor.cpp
-index f75fdd9..c7fde15 100644
--- a/GraphEditor.cpp
-+++ b/GraphEditor.cpp
-@@ -837,7 +837,7 @@ void Show(Delegate& delegate, const Options& options, ViewState& viewState, bool
-     captureOffset = viewState.mPosition * viewState.mFactor;
- 
-     //ImGui::InvisibleButton("GraphEditorButton", canvasSize);
-    ImGui::BeginChildFrame(71711, canvasSize);
-+    ImGui::BeginChild(71711, canvasSize, ImGuiChildFlags_FrameStyle);
- 
-     ImGui::SetCursorPos(windowPos);
-     ImGui::BeginGroup();
-@@ -1030,7 +1030,7 @@ void Show(Delegate& delegate, const Options& options, ViewState& viewState, bool
-     ImGui::PopStyleColor(1);
-     ImGui::PopStyleVar(2);
-     ImGui::EndGroup();
-    ImGui::EndChildFrame();
-+    ImGui::EndChild();
- 
-     ImGui::PopStyleVar(3);
-     
-diff --git a/ImCurveEdit.cpp b/ImCurveEdit.cpp
-index f0d5a97..6914af0 100644
--- a/ImCurveEdit.cpp
-+++ b/ImCurveEdit.cpp
-@@ -148,7 +148,7 @@ namespace ImCurveEdit
-       ImGuiIO& io = ImGui::GetIO();
-       ImGui::PushStyleVar(ImGuiStyleVar_FramePadding, ImVec2(0, 0));
-       ImGui::PushStyleColor(ImGuiCol_Border, 0);
-      ImGui::BeginChildFrame(id, size);
-+      ImGui::BeginChild(id, size, ImGuiChildFlags_FrameStyle);
-       delegate.focused = ImGui::IsWindowFocused();
-       ImDrawList* draw_list = ImGui::GetWindowDrawList();
-       if (clippingRect)
-@@ -441,7 +441,7 @@ namespace ImCurveEdit
-       if (clippingRect)
-          draw_list->PopClipRect();
- 
-      ImGui::EndChildFrame();
-+      ImGui::EndChild();
-       ImGui::PopStyleVar();
-       ImGui::PopStyleColor(1);
- 
-diff --git a/ImGradient.cpp b/ImGradient.cpp
-index 734200e..8fce078 100644
--- a/ImGradient.cpp
-+++ b/ImGradient.cpp
-@@ -67,7 +67,7 @@ namespace ImGradient
-       bool ret = false;
-       ImGuiIO& io = ImGui::GetIO();
-       ImGui::PushStyleVar(ImGuiStyleVar_FramePadding, ImVec2(0, 0));
-      ImGui::BeginChildFrame(137, size);
-+      ImGui::BeginChild(137, size, ImGuiChildFlags_FrameStyle);
- 
-       ImDrawList* draw_list = ImGui::GetWindowDrawList();
-       const ImVec2 offset = ImGui::GetCursorScreenPos();
-@@ -107,7 +107,7 @@ namespace ImGradient
-          delegate.AddPoint(delegate.GetPoint(t));
-          ret = true;
-       }
-      ImGui::EndChildFrame();
-+      ImGui::EndChild();
-       ImGui::PopStyleVar();
- 
-       selection = currentSelection;
-diff --git a/ImSequencer.cpp b/ImSequencer.cpp
-index aff7729..3a0c8e8 100644
--- a/ImSequencer.cpp
-+++ b/ImSequencer.cpp
-@@ -162,7 +162,7 @@ namespace ImSequencer
-          ImVec2 childFramePos = ImGui::GetCursorScreenPos();
-          ImVec2 childFrameSize(canvas_size.x, canvas_size.y - 8.f - headerSize.y - (hasScrollBar ? scrollBarSize.y : 0));
-          ImGui::PushStyleColor(ImGuiCol_FrameBg, 0);
-         ImGui::BeginChildFrame(889, childFrameSize);
-+         ImGui::BeginChild(890, childFrameSize, ImGuiChildFlags_FrameStyle);
-          sequence->focused = ImGui::IsWindowFocused();
-          ImGui::InvisibleButton("contentBar", ImVec2(canvas_size.x, float(controlHeight)));
-          const ImVec2 contentMin = ImGui::GetItemRectMin();
-@@ -511,7 +511,7 @@ namespace ImSequencer
-          }
-          //
- 
-         ImGui::EndChildFrame();
-+         ImGui::EndChild();
-          ImGui::PopStyleColor();
-          if (hasScrollBar)
-          {
--- a/ports/imguizmo/portfile.cmake
+++ b/ports/imguizmo/portfile.cmake
@ -1,26 +1,24 @@
-vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
-
-vcpkg_from_github(
-    OUT_SOURCE_PATH SOURCE_PATH
-    REPO CedricGuillemet/ImGuizmo
-    REF ba662b119d64f9ab700bb2cd7b2781f9044f5565
-    SHA512 682d785b582379914d525985de3a0bc04932b4ed715607127b1803ffba4d9b85165255dca1c18d2fd0934bab43de5d6c9c2d9909ac84d0ddaea12dad1871bcf8
-    HEAD_REF master
-    PATCHES
-        fix-imgui-1.92.5.patch
-)
-
-file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}")
-
-vcpkg_cmake_configure(
-    SOURCE_PATH "${SOURCE_PATH}"
-    OPTIONS_DEBUG
-        -DIMGUIZMO_SKIP_HEADERS=ON
-)
-
-vcpkg_cmake_install()
-
-vcpkg_copy_pdbs()
-vcpkg_cmake_config_fixup(PACKAGE_NAME ${PORT} CONFIG_PATH share/${PORT})
-
-vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
+vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO CedricGuillemet/ImGuizmo
+    REF ${VERSION}
+    SHA512 1838cf6d9116aea7c2aa6c3ee978ffdab47a6714a564723b1c4f62d8a68081a56ebc65a389f5b7fb0c7e37ec5fc1cda6db0190826da055fbfb10133d06a88878
+    HEAD_REF master
+)
+
+file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}")
+
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
+    OPTIONS_DEBUG
+        -DIMGUIZMO_SKIP_HEADERS=ON
+)
+
+vcpkg_cmake_install()
+
+vcpkg_copy_pdbs()
+vcpkg_cmake_config_fixup(PACKAGE_NAME ${PORT} CONFIG_PATH share/${PORT})
+
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
--- a/ports/imguizmo/vcpkg.json
+++ b/ports/imguizmo/vcpkg.json
@ -1,7 +1,6 @@
 {
  "name": "imguizmo",
-  "version-date": "2024-05-29",
-  "port-version": 2,
+  "version": "1.9",
  "description": "Immediate mode 3D gizmo for scene editing and other controls based on Dear ImGui",
  "homepage": "https://github.com/CedricGuillemet/ImGuizmo",
  "license": "MIT",
--- a/versions/baseline.json
+++ b/versions/baseline.json
@ -3957,8 +3957,8 @@
      "port-version": 3
    },
    "imguizmo": {
-      "baseline": "2024-05-29",
-      "port-version": 2
+      "baseline": "1.9",
+      "port-version": 0
    },
    "immer": {
      "baseline": "0.9.1",
--- a/versions/i-/imguizmo.json
+++ b/versions/i-/imguizmo.json
@ -1,5 +1,10 @@
 {
  "versions": [
+    {
+      "git-tree": "2c3c2af33de915037fefd6e16de2a7cf3acf25ad",
+      "version": "1.9",
+      "port-version": 0
+    },
    {
      "git-tree": "bd616ed69a9c82a561a23ea1afcd9eedd1bb5839",
      "version-date": "2024-05-29",