From a5e89b5aa695753f71339a178358c2011fb047e9 Mon Sep 17 00:00:00 2001 From: Green Sky Date: Wed, 21 May 2025 12:42:49 +0200 Subject: [PATCH] remove imgui color text editor it is unmaintained and outdated --- .gitmodules | 3 --- external/CMakeLists.txt | 3 --- external/ImGuiColorTextEdit | 1 - external/ImGuiColorTextEdit.cmake | 12 --------- framework/imgui/CMakeLists.txt | 6 ++--- .../imgui/src/mm/services/scene_tools.cpp | 1 - framework/imgui/test/CMakeLists.txt | 26 +++++++++---------- 7 files changed, 16 insertions(+), 36 deletions(-) delete mode 160000 external/ImGuiColorTextEdit delete mode 100644 external/ImGuiColorTextEdit.cmake diff --git a/.gitmodules b/.gitmodules index f476259..b48fb3d 100644 --- a/.gitmodules +++ b/.gitmodules @@ -16,9 +16,6 @@ path = external/imgui/imgui url = https://github.com/ocornut/imgui.git shallow = true -[submodule "external/ImGuiColorTextEdit"] - path = external/ImGuiColorTextEdit - url = https://github.com/BalazsJako/ImGuiColorTextEdit.git [submodule "external/soloud/soloud"] path = external/soloud/soloud url = https://github.com/jarikomppa/soloud.git diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt index 8e7400b..33dc83a 100644 --- a/external/CMakeLists.txt +++ b/external/CMakeLists.txt @@ -47,9 +47,6 @@ if(NOT MM_HEADLESS) # (debug) gui add_subdirectory("imgui") - # (debug) text editor - include("${CMAKE_CURRENT_SOURCE_DIR}/ImGuiColorTextEdit.cmake") - # sound, uses sdl2-static backend add_subdirectory("soloud") endif() diff --git a/external/ImGuiColorTextEdit b/external/ImGuiColorTextEdit deleted file mode 160000 index 0a88824..0000000 --- a/external/ImGuiColorTextEdit +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 0a88824f7de8d0bd11d8419066caa7d3469395c4 diff --git a/external/ImGuiColorTextEdit.cmake b/external/ImGuiColorTextEdit.cmake deleted file mode 100644 index 4b51890..0000000 --- a/external/ImGuiColorTextEdit.cmake +++ /dev/null @@ -1,12 +0,0 @@ -cmake_minimum_required(VERSION 3.9 FATAL_ERROR) - -add_library(imgui_color_text_edit - "${CMAKE_CURRENT_LIST_DIR}/ImGuiColorTextEdit/TextEditor.h" - "${CMAKE_CURRENT_LIST_DIR}/ImGuiColorTextEdit/TextEditor.cpp" -) -target_compile_features(imgui_color_text_edit PUBLIC cxx_std_11) -target_include_directories(imgui_color_text_edit PUBLIC "${CMAKE_CURRENT_LIST_DIR}/ImGuiColorTextEdit") -target_link_libraries(imgui_color_text_edit - imgui -) - diff --git a/framework/imgui/CMakeLists.txt b/framework/imgui/CMakeLists.txt index e647c98..018b919 100644 --- a/framework/imgui/CMakeLists.txt +++ b/framework/imgui/CMakeLists.txt @@ -93,8 +93,8 @@ add_library(imgui_tools ./src/mm/imgui/file_shader_editor.hpp ./src/mm/imgui/fps_overlay.cpp - ./src/mm/imgui/file_text_editor.cpp - ./src/mm/imgui/file_shader_editor.cpp + #./src/mm/imgui/file_text_editor.cpp + #./src/mm/imgui/file_shader_editor.cpp ./src/mm/services/scene_tools.hpp ./src/mm/services/scene_tools.cpp @@ -110,7 +110,7 @@ target_include_directories(imgui_tools PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/src") target_link_libraries(imgui_tools imgui_render_task imgui_widgets - imgui_color_text_edit + #imgui_color_text_edit screen_director ) diff --git a/framework/imgui/src/mm/services/scene_tools.cpp b/framework/imgui/src/mm/services/scene_tools.cpp index 280c9ba..b3676ed 100644 --- a/framework/imgui/src/mm/services/scene_tools.cpp +++ b/framework/imgui/src/mm/services/scene_tools.cpp @@ -1,5 +1,4 @@ #include "./scene_tools.hpp" -#include "mm/engine_fwd.hpp" #include diff --git a/framework/imgui/test/CMakeLists.txt b/framework/imgui/test/CMakeLists.txt index 8ecd992..d25e66b 100644 --- a/framework/imgui/test/CMakeLists.txt +++ b/framework/imgui/test/CMakeLists.txt @@ -93,20 +93,20 @@ add_test(NAME imgui_sound_test COMMAND imgui_sound_test) #################### -add_executable(imgui_text_edit_test - ./text_edit_test.cpp -) +#add_executable(imgui_text_edit_test +# ./text_edit_test.cpp +#) -target_include_directories(imgui_text_edit_test PRIVATE ".") +#target_include_directories(imgui_text_edit_test PRIVATE ".") -target_link_libraries(imgui_text_edit_test - engine - opengl_renderer_s - imgui_service - imgui_render_task - imgui_tools - gtest_main -) +#target_link_libraries(imgui_text_edit_test +# engine +# opengl_renderer_s +# imgui_service +# imgui_render_task +# imgui_tools +# gtest_main +#) -add_test(NAME imgui_text_edit_test COMMAND imgui_text_edit_test) +#add_test(NAME imgui_text_edit_test COMMAND imgui_text_edit_test)