Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,4 @@
url = https://github.com/epezent/implot
[submodule "deps/imgui/ImGuizmo"]
path = deps/imgui/ImGuizmo
url = https://github.com/nmwsharp/ImGuizmo.git
url = https://github.com/jdumas/ImGuizmo.git
8 changes: 4 additions & 4 deletions deps/imgui/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ list(APPEND SRCS
)

# imguizmo sources
list(APPEND SRCS
ImGuizmo/ImGuizmo.cpp
list(APPEND SRCS
ImGuizmo/src/ImGuizmo.cpp
)


Expand Down Expand Up @@ -70,7 +70,7 @@ if("${POLYSCOPE_BACKEND_OPENGL3_GLFW}")
target_include_directories(imgui PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/imgui/")
target_include_directories(imgui PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/custom_backends/")
target_include_directories(imgui PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/implot/")
target_include_directories(imgui PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/ImGuizmo/")
target_include_directories(imgui PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/ImGuizmo/src/")
target_include_directories(imgui PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/../glad/include/")
target_link_libraries(imgui PRIVATE glfw)

Expand Down Expand Up @@ -99,7 +99,7 @@ if("${POLYSCOPE_BACKEND_OPENGL3_EGL}")

target_include_directories(imgui PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/imgui/")
target_include_directories(imgui PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/implot/")
target_include_directories(imgui PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/ImGuizmo/")
target_include_directories(imgui PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/ImGuizmo/src/")
target_include_directories(imgui PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/../glad/include/")

# linux only
Expand Down
2 changes: 1 addition & 1 deletion deps/imgui/ImGuizmo
Submodule ImGuizmo updated 52 files
+0 −11 .editorconfig
+51 −0 .github/workflows/build.yml
+141 −0 .github/workflows/release.yml
+3 −0 .gitignore
+53 −0 CMakeLists.txt
+2 −2 Makefile
+28 −160 README.md
+ bin/ImGuizmoSample.exe
+0 −25 bin/imgui.ini
+186 −0 docs/documentation.md
+31 −0 example/CMakeLists.txt
+1,503 −3,266 example/ImApp.h
+0 −184 example/ImGuizmoSample.vcxproj
+0 −147 example/imconfig.h
+0 −18,049 example/imgui.cpp
+0 −4,173 example/imgui.h
+0 −10,886 example/imgui_demo.cpp
+0 −6,342 example/imgui_draw.cpp
+0 −3,950 example/imgui_internal.h
+0 −4,569 example/imgui_tables.cpp
+0 −10,784 example/imgui_widgets.cpp
+0 −627 example/imstb_rectpack.h
+0 −1,527 example/imstb_textedit.h
+0 −5,085 example/imstb_truetype.h
+434 −59 example/main.cpp
+0 −7,187 example/stb_image.h
+ images/ImViewGizmo.gif
+ images/bounds.gif
+ images/dialog.png
+ images/nodeeditor.jpg
+ images/rotation.gif
+ images/sample.png
+ images/sequencer.png
+ images/translation.gif
+ images/vectoreditor.png
+18 −1 src/GraphEditor.cpp
+1 −1 src/GraphEditor.h
+10 −2 src/ImCurveEdit.cpp
+1 −1 src/ImCurveEdit.h
+8 −1 src/ImGradient.cpp
+1 −1 src/ImGradient.h
+366 −107 src/ImGuizmo.cpp
+38 −1 src/ImGuizmo.h
+94 −0 src/ImLightRig.h
+1 −1 src/ImSequencer.cpp
+1 −1 src/ImSequencer.h
+815 −0 src/ImVectorEditor.cpp
+205 −0 src/ImVectorEditor.h
+2 −2 src/ImZoomSlider.h
+3 −2 vcpkg-example/CMakeLists.txt
+0 −3,597 vcpkg-example/ImApp.h
+33 −17 vcpkg-example/main.cpp
2 changes: 1 addition & 1 deletion deps/imgui/imgui
Submodule imgui updated 123 files
2 changes: 1 addition & 1 deletion src/color_bar.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,7 @@ void OnscreenColorBarWidget::draw() {

// draw the border around the map
dl->AddRect(barTopLeft, ImVec2(barTopLeft.x + barRegionWidth, barTopLeft.y + barRegionHeight), foregroundColor, 0.f,
ImDrawFlags_None, borderWidth);
borderWidth, ImDrawFlags_None);

// title text
dl->AddText(ImVec2(barTopLeft.x + 0.5 * borderWidth, barTopLeft.y - 1.3 * titleHeight), foregroundColor,
Expand Down
Loading