Fixed

cmaughan · cmaughan · commit ab3ea241c984 · 2026-02-08T16:43:57.000Z
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,12 +1,12 @@
-cmake_minimum_required(VERSION 3.5)
+cmake_minimum_required(VERSION 4.0)
 
 message(STATUS " CMakeLists: NodeGraph")
 
 option(BUILD_NODEGRAPH_TESTS "Build Tests" OFF)
 option(BUILD_NODEGRAPH_APP "Build APP" ON)
 
 # Global Settings
-set(CMAKE_CXX_STANDARD 20)
+set(CMAKE_CXX_STANDARD 23)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 set_property(GLOBAL PROPERTY USE_FOLDERS ON)
@@ -27,8 +27,7 @@ project(NodeGraph
 
 include(cmake/utils.cmake)
 
-find_package(SDL2 REQUIRED)
-find_package(fmt CONFIG REQUIRED)
+find_package(SDL3 REQUIRED)
 find_package(freetype CONFIG REQUIRED)
 
 set(NODEGRAPH_ROOT ${CMAKE_CURRENT_LIST_DIR})
diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt
@@ -42,7 +42,6 @@ target_include_directories(${APP_NAME}
 target_link_libraries (${APP_NAME}
     PRIVATE
     NodeGraph::NodeGraph
-    SDL2::SDL2main
     Zing::Zing
     ${PLATFORM_LINKLIBS}
     )
diff --git a/app/demo.cpp b/app/demo.cpp
@@ -1,5 +1,5 @@
 #include <filesystem>
-#include <fmt/format.h>
+#include <format>
 #include <memory>
 
 #include <nodegraph/IconsFontAwesome5.h>
@@ -64,15 +64,15 @@ void demo_hierarchy_editor()
         }
 
         std::string type = widget->GetLayout()->GetLayoutType() == LayoutType::Horizontal ? "Horizontal" : "Vertical";
-        node_open = ImGui::TreeNode(widget, fmt::format("{} ({})", widget->GetLabel(), type).c_str());
+        node_open = ImGui::TreeNode(widget, std::format("{} ({})", widget->GetLabel(), type).c_str());
 
         if (node_open)
         {
             auto layout = widget->GetLayout();
             if (!layout->GetChildren().empty())
             {
                 // std::string type = layout->GetLayoutType() == LayoutType::Horizontal ? "Horizontal" : "Vertical";
-                // bool node_open = ImGui::TreeNode(layout, fmt::format("({} Children)", type).c_str());
+                // bool node_open = ImGui::TreeNode(layout, std::format("({} Children)", type).c_str());
                 // if (node_open)
                 {
 
diff --git a/app/main.cpp b/app/main.cpp
diff --git a/app/nodes/node_oscillator.cpp b/app/nodes/node_oscillator.cpp
@@ -1,7 +1,5 @@
 #include <cassert>
 
-#include <fmt/format.h>
-
 #include <nodes/node_oscillator.h>
 #include <utils/wavetable.h>
 
diff --git a/libs/zing b/libs/zing
@@ -1 +1 @@
-Subproject commit d4891911c13cd32020c302ac841a08fdd0ac5013
+Subproject commit 39daf9c66f75f0a1340e8281b4f05a1b105c5632
diff --git a/prebuild.bat b/prebuild.bat
@@ -10,7 +10,7 @@ if not exist "vcpkg\vcpkg.exe" (
 
 cd vcpkg
 echo Installing Libraries
-vcpkg install pkgconf cppcodec ableton-link concurrentqueue tinydir kissfft portaudio stb date fmt clipp tomlplusplus glm sdl2[vulkan] magic-enum catch2 --triplet x64-windows-static-md --recurse
+vcpkg install pkgconf tinyfiledialogs tinydir cppcodec ableton-link concurrentqueue tinydir kissfft portaudio stb date fmt clipp tomlplusplus glm sdl3[vulkan] magic-enum catch2 --triplet x64-windows-static-md --recurse
 cd %~dp0
 echo %Time%
 
diff --git a/prebuild.sh b/prebuild.sh
@@ -13,7 +13,7 @@ if [ "$(uname)" == "Darwin" ]; then
 fi
 
 cd vcpkg
-./vcpkg install portaudio stb date tinydir fmt clipp tomlplusplus glm sdl2[vulkan] magic-enum catch2 --triplet ${triplet[0]} --recurse
+./vcpkg install portaudio stb date tinydir fmt clipp tomlplusplus glm sdl3[vulkan] magic-enum catch2 --triplet ${triplet[0]} --recurse
 if [ "$(uname)" != "Darwin" ]; then
 ./vcpkg install glib --triplet ${triplet[0]} --recurse
 fi
diff --git a/settings.toml b/settings.toml
@@ -56,4 +56,4 @@ s_sliderTipBorderSize = 0.0
 s_sliderTipFontPad = 7.0
 s_sliderTipFontSize = 36.0
 s_sliderTipShadowSize = 4.0
-s_windowSize = [ 3840.0, 2224.0 ]
+s_windowSize = [ 3840.0, 2036.0 ]
diff --git a/src/canvas_imgui.cpp b/src/canvas_imgui.cpp
@@ -123,22 +123,22 @@ void CanvasImGui::FillGradientRoundedRectVarying(const NRectf& rc, const glm::ve
     auto flags = 0;
     if (radius.x > 0.0f)
     {
-        flags |= ImDrawCornerFlags_TopLeft;
+        flags |= ImDrawFlags_RoundCornersTopLeft;
         worldSize0 = WorldSizeToPixelSize(radius.x);
     }
     if (radius.y > 0.0f)
     {
-        flags |= ImDrawCornerFlags_TopRight;
+        flags |= ImDrawFlags_RoundCornersTopRight;
         worldSize0 = WorldSizeToPixelSize(radius.y);
     }
     if (radius.z > 0.0f)
     {
-        flags |= ImDrawCornerFlags_BotRight;
+        flags |= ImDrawFlags_RoundCornersBottomRight;
         worldSize0 = WorldSizeToPixelSize(radius.z);
     }
     if (radius.w > 0.0f)
     {
-        flags |= ImDrawCornerFlags_BotLeft;
+        flags |= ImDrawFlags_RoundCornersBottomLeft;
         worldSize0 = WorldSizeToPixelSize(radius.w);
     }
 
diff --git a/src/widgets/layout.cpp b/src/widgets/layout.cpp
@@ -1,5 +1,3 @@
-#include <fmt/format.h>
-
 #include <zest/logger/logger.h>
 
 #include <nodegraph/canvas.h>
diff --git a/src/widgets/widget.cpp b/src/widgets/widget.cpp
@@ -1,6 +1,6 @@
 #include <functional>
 
-#include <fmt/format.h>
+#include <format>
 
 #include <zest/logger/logger.h>
 
@@ -341,7 +341,7 @@ void Widget::DrawTip(Canvas& canvas, const glm::vec2& widgetTopCenter, const Wid
             return;
         }
         //std::string tip = fmt::format("{}: {} {}", val.name, val.value, val.units);
-        std::string tip = fmt::format("{} {}", val.valueText, val.units);
+        std::string tip = std::format("{} {}", val.valueText, val.units);
 
         auto& settings = Zest::GlobalSettingsManager::Instance();
         auto theme = settings.GetCurrentTheme();
diff --git a/src/widgets/widget_knob.cpp b/src/widgets/widget_knob.cpp
@@ -1,5 +1,5 @@
 #include <algorithm>
-#include <fmt/format.h>
+#include <format>
 
 #include <zest/logger/logger.h>
 
@@ -237,7 +237,7 @@ void Knob::UpdateKnob(Knob* pKnob, KnobOp op, KnobValue& val)
     }
     else
     {
-        m_value.valueText = fmt::format("{:1.2f}", m_value.value);
+        m_value.valueText = std::format("{:1.2f}", m_value.value);
         val = m_value;
     }
 }
diff --git a/src/widgets/widget_label.cpp b/src/widgets/widget_label.cpp
@@ -1,5 +1,4 @@
 #include <algorithm>
-#include <fmt/format.h>
 
 #include <zest/logger/logger.h>
 
diff --git a/src/widgets/widget_slider.cpp b/src/widgets/widget_slider.cpp
@@ -1,5 +1,5 @@
 #include <algorithm>
-#include <fmt/format.h>
+#include <format>
 
 #include <zest/logger/logger.h>
 
@@ -26,7 +26,7 @@ void DefaultSliderCB::UpdateSlider(Slider* pSlider, SliderOp op, SliderValue& va
     if (op == SliderOp::Get)
     {
         myVal.name = pSlider->GetLabel();
-        myVal.valueText = fmt::format("{:1.2f}", myVal.value);
+        myVal.valueText = std::format("{:1.2f}", myVal.value);
         val = myVal;
     }
     else
diff --git a/src/widgets/widget_socket.cpp b/src/widgets/widget_socket.cpp
@@ -1,5 +1,5 @@
 #include <algorithm>
-#include <fmt/format.h>
+#include <format>
 #include <zest/logger/logger.h>
 #include <nodegraph/canvas.h>
 #include <nodegraph/theme.h>
@@ -127,7 +127,7 @@ void Socket::UpdateSocket(Socket* pSocket, SocketOp op, SocketValue& val)
     }
     else
     {
-        m_value.valueText = fmt::format("{:1.2f}", m_value.value);
+        m_value.valueText = std::format("{:1.2f}", m_value.value);
         val = m_value;
     }
 }
diff --git a/src/widgets/widget_waveslider.cpp b/src/widgets/widget_waveslider.cpp
@@ -1,5 +1,4 @@
 #include <algorithm>
-#include <fmt/format.h>
 
 #include <zest/logger/logger.h>
 
diff --git a/vcpkg b/vcpkg
@@ -1 +1 @@
-Subproject commit 77b0517c520a86ec0461ebb1155a0314c0a0eeac
+Subproject commit aa2d37682e3318d93aef87efa7b0e88e81cd3d59

Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,6 @@ target_include_directories(${APP_NAME}`
`42`	`42`	`target_link_libraries (${APP_NAME}`
`43`	`43`	`PRIVATE`
`44`	`44`	`NodeGraph::NodeGraph`
`45`		`- SDL2::SDL2main`
`46`	`45`	`Zing::Zing`
`47`	`46`	`${PLATFORM_LINKLIBS}`
`48`	`47`	`)`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`#include <filesystem>`
`2`		`-#include <fmt/format.h>`
	`2`	`+#include <format>`
`3`	`3`	`#include <memory>`
`4`	`4`
`5`	`5`	`#include <nodegraph/IconsFontAwesome5.h>`
`@@ -64,15 +64,15 @@ void demo_hierarchy_editor()`
`64`	`64`	`}`
`65`	`65`
`66`	`66`	`std::string type = widget->GetLayout()->GetLayoutType() == LayoutType::Horizontal ? "Horizontal" : "Vertical";`
`67`		`- node_open = ImGui::TreeNode(widget, fmt::format("{} ({})", widget->GetLabel(), type).c_str());`
	`67`	`+ node_open = ImGui::TreeNode(widget, std::format("{} ({})", widget->GetLabel(), type).c_str());`
`68`	`68`
`69`	`69`	`if (node_open)`
`70`	`70`	`{`
`71`	`71`	`auto layout = widget->GetLayout();`
`72`	`72`	`if (!layout->GetChildren().empty())`
`73`	`73`	`{`
`74`	`74`	`// std::string type = layout->GetLayoutType() == LayoutType::Horizontal ? "Horizontal" : "Vertical";`
`75`		`- // bool node_open = ImGui::TreeNode(layout, fmt::format("({} Children)", type).c_str());`
	`75`	`+ // bool node_open = ImGui::TreeNode(layout, std::format("({} Children)", type).c_str());`
`76`	`76`	`// if (node_open)`
`77`	`77`	`{`
`78`	`78`
Original file line number	Diff line number	Diff line change
`@@ -123,22 +123,22 @@ void CanvasImGui::FillGradientRoundedRectVarying(const NRectf& rc, const glm::ve`
`123`	`123`	`auto flags = 0;`
`124`	`124`	`if (radius.x > 0.0f)`
`125`	`125`	`{`
`126`		`- flags \|= ImDrawCornerFlags_TopLeft;`
	`126`	`+ flags \|= ImDrawFlags_RoundCornersTopLeft;`
`127`	`127`	`worldSize0 = WorldSizeToPixelSize(radius.x);`
`128`	`128`	`}`
`129`	`129`	`if (radius.y > 0.0f)`
`130`	`130`	`{`
`131`		`- flags \|= ImDrawCornerFlags_TopRight;`
	`131`	`+ flags \|= ImDrawFlags_RoundCornersTopRight;`
`132`	`132`	`worldSize0 = WorldSizeToPixelSize(radius.y);`
`133`	`133`	`}`
`134`	`134`	`if (radius.z > 0.0f)`
`135`	`135`	`{`
`136`		`- flags \|= ImDrawCornerFlags_BotRight;`
	`136`	`+ flags \|= ImDrawFlags_RoundCornersBottomRight;`
`137`	`137`	`worldSize0 = WorldSizeToPixelSize(radius.z);`
`138`	`138`	`}`
`139`	`139`	`if (radius.w > 0.0f)`
`140`	`140`	`{`
`141`		`- flags \|= ImDrawCornerFlags_BotLeft;`
	`141`	`+ flags \|= ImDrawFlags_RoundCornersBottomLeft;`
`142`	`142`	`worldSize0 = WorldSizeToPixelSize(radius.w);`
`143`	`143`	`}`
`144`	`144`