From fa7904a46908407223ac65f1a233b4af57171503 Mon Sep 17 00:00:00 2001 From: Dan Paulat Date: Thu, 28 Aug 2025 11:37:06 -0500 Subject: [PATCH 1/7] Update aws-sdk-cpp to 1.11.636 --- external/aws-sdk-cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external/aws-sdk-cpp b/external/aws-sdk-cpp index 9c95a05a..8d31e042 160000 --- a/external/aws-sdk-cpp +++ b/external/aws-sdk-cpp @@ -1 +1 @@ -Subproject commit 9c95a05a5a99718965c033c6e1fc3f8bb34a1b83 +Subproject commit 8d31e042f950fe70924391a205cceaf342ecec00 From 335cb5d396751b1b5797b96741dee6c0ab26b273 Mon Sep 17 00:00:00 2001 From: Dan Paulat Date: Thu, 28 Aug 2025 11:40:27 -0500 Subject: [PATCH 2/7] Update cmake-conan to latest develop2 (2025-06-03) --- external/cmake-conan | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external/cmake-conan b/external/cmake-conan index c22bbf0a..b0e4d1ec 160000 --- a/external/cmake-conan +++ b/external/cmake-conan @@ -1 +1 @@ -Subproject commit c22bbf0af0b73d5f0def24a9cdf4ce503ae79e5d +Subproject commit b0e4d1ec08edb35ef31033938567d621f6643c17 From 72ddf606f3a7a430d6abe8f9e7ab2f7ee7f0cb82 Mon Sep 17 00:00:00 2001 From: Dan Paulat Date: Thu, 28 Aug 2025 11:41:08 -0500 Subject: [PATCH 3/7] Update date to latest (2025-08-13) --- external/date | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external/date b/external/date index ca572785..a5db3aec 160000 --- a/external/date +++ b/external/date @@ -1 +1 @@ -Subproject commit ca5727855bd1bae12b2c6ca36cd88649d43ec862 +Subproject commit a5db3aecec580bc78b6c01c118f2628676769b69 From 33419cfee34014af3559e774a155f46cfeb6f0db Mon Sep 17 00:00:00 2001 From: Dan Paulat Date: Thu, 28 Aug 2025 11:44:46 -0500 Subject: [PATCH 4/7] Update stb to latest (2025-05-26) --- external/stb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external/stb b/external/stb index 5c205738..f58f558c 160000 --- a/external/stb +++ b/external/stb @@ -1 +1 @@ -Subproject commit 5c205738c191bcb0abc65c4febfa9bd25ff35234 +Subproject commit f58f558c120e9b32c217290b80bad1a0729fbb2c From f59bb2be3e1112552cec13aa51b7af9de74aa483 Mon Sep 17 00:00:00 2001 From: Dan Paulat Date: Thu, 28 Aug 2025 12:04:49 -0500 Subject: [PATCH 5/7] Update maplibre-native-qt to latest (2025-08-18) --- external/maplibre-native-qt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external/maplibre-native-qt b/external/maplibre-native-qt index 527734fd..8b406978 160000 --- a/external/maplibre-native-qt +++ b/external/maplibre-native-qt @@ -1 +1 @@ -Subproject commit 527734fdcacf8d85185776f4b020b94a8c937cdd +Subproject commit 8b40697895c19da4479cd037a76608f4c36935e8 From e94e6fabd2130e9b7235de58ddf0a7a4c2029aeb Mon Sep 17 00:00:00 2001 From: Dan Paulat Date: Thu, 28 Aug 2025 12:05:36 -0500 Subject: [PATCH 6/7] Sorting .gitmodules --- .gitmodules | 60 ++++++++++++++++++++++++++--------------------------- 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/.gitmodules b/.gitmodules index a6f47235..5bf3b307 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,45 +1,45 @@ -[submodule "external/cmake-conan"] - path = external/cmake-conan - url = https://github.com/conan-io/cmake-conan.git -[submodule "test/data"] - path = test/data - url = https://github.com/dpaulat/supercell-wx-test-data -[submodule "external/hsluv-c"] - path = external/hsluv-c - url = https://github.com/hsluv/hsluv-c.git -[submodule "external/stb"] - path = external/stb - url = https://github.com/nothings/stb.git [submodule "data"] path = data url = https://github.com/dpaulat/supercell-wx-data +[submodule "external/aws-sdk-cpp"] + path = external/aws-sdk-cpp + url = https://github.com/aws/aws-sdk-cpp.git +[submodule "external/cmake-conan"] + path = external/cmake-conan + url = https://github.com/conan-io/cmake-conan.git +[submodule "external/date"] + path = external/date + url = https://github.com/HowardHinnant/date.git +[submodule "external/glad"] + path = external/glad + url = https://github.com/Dav1dde/glad.git +[submodule "external/hsluv-c"] + path = external/hsluv-c + url = https://github.com/hsluv/hsluv-c.git [submodule "external/imgui"] path = external/imgui url = https://github.com/ocornut/imgui.git [submodule "external/imgui-backend-qt"] path = external/imgui-backend-qt url = https://github.com/dpaulat/imgui-backend-qt -[submodule "external/aws-sdk-cpp"] - path = external/aws-sdk-cpp - url = https://github.com/aws/aws-sdk-cpp.git -[submodule "external/date"] - path = external/date - url = https://github.com/HowardHinnant/date.git -[submodule "external/units"] - path = external/units - url = https://github.com/nholthaus/units.git -[submodule "external/textflowcpp"] - path = external/textflowcpp - url = https://github.com/catchorg/textflowcpp.git -[submodule "external/maplibre-native-qt"] - path = external/maplibre-native-qt - url = https://github.com/dpaulat/maplibre-native-qt.git [submodule "external/maplibre-native"] path = external/maplibre-native url = https://github.com/dpaulat/maplibre-gl-native.git +[submodule "external/maplibre-native-qt"] + path = external/maplibre-native-qt + url = https://github.com/dpaulat/maplibre-native-qt.git [submodule "external/qt6ct"] path = external/qt6ct url = https://github.com/AdenKoperczak/qt6ct.git -[submodule "external/glad"] - path = external/glad - url = https://github.com/Dav1dde/glad.git +[submodule "external/stb"] + path = external/stb + url = https://github.com/nothings/stb.git +[submodule "external/textflowcpp"] + path = external/textflowcpp + url = https://github.com/catchorg/textflowcpp.git +[submodule "external/units"] + path = external/units + url = https://github.com/nholthaus/units.git +[submodule "test/data"] + path = test/data + url = https://github.com/dpaulat/supercell-wx-test-data From d0f4815ef9bd46f939271bdba944179bca65c899 Mon Sep 17 00:00:00 2001 From: Dan Paulat Date: Thu, 28 Aug 2025 12:09:32 -0500 Subject: [PATCH 7/7] Synchronizing imconfig.h to v1.92.2b --- external/include/scwx/external/imgui/imconfig.h | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/external/include/scwx/external/imgui/imconfig.h b/external/include/scwx/external/imgui/imconfig.h index 6064c40d..ac954a77 100644 --- a/external/include/scwx/external/imgui/imconfig.h +++ b/external/include/scwx/external/imgui/imconfig.h @@ -89,8 +89,7 @@ //---- Use FreeType + plutosvg or lunasvg to render OpenType SVG fonts (SVGinOT) // Only works in combination with IMGUI_ENABLE_FREETYPE. -// - lunasvg is currently easier to acquire/install, as e.g. it is part of vcpkg. -// - plutosvg will support more fonts and may load them faster. It currently requires to be built manually but it is fairly easy. See misc/freetype/README for instructions. +// - plutosvg is currently easier to install, as e.g. it is part of vcpkg. It will support more fonts and may load them faster. See misc/freetype/README for instructions. // - Both require headers to be available in the include path + program to be linked with the library code (not provided). // - (note: lunasvg implementation is based on Freetype's rsvg-port.c which is licensed under CeCILL-C Free Software License Agreement) //#define IMGUI_ENABLE_FREETYPE_PLUTOSVG @@ -131,6 +130,10 @@ //#define IM_DEBUG_BREAK IM_ASSERT(0) //#define IM_DEBUG_BREAK __debugbreak() +//---- Debug Tools: Enable highlight ID conflicts _before_ hovering items. When io.ConfigDebugHighlightIdConflicts is set. +// (THIS WILL SLOW DOWN DEAR IMGUI. Only use occasionally and disable after use) +//#define IMGUI_DEBUG_HIGHLIGHT_ALL_ID_CONFLICTS + //---- Debug Tools: Enable slower asserts //#define IMGUI_DEBUG_PARANOID