Running again

Author: cmaughan

CMakeLists.txt

@@ -30,7 +30,6 @@ include(cmake/utils.cmake)
 find_package(SDL2 REQUIRED)
 find_package(fmt REQUIRED)
 find_package(freetype CONFIG REQUIRED)
-find_package(imgui REQUIRED)
 
 set(NODEGRAPH_ROOT ${CMAKE_CURRENT_LIST_DIR})
 set(M3RDPARTY_DIR ${CMAKE_CURRENT_LIST_DIR}/m3rdparty)

app/CMakeLists.txt

@@ -42,7 +42,6 @@ target_include_directories(${APP_NAME}
 target_link_libraries (${APP_NAME}
     PRIVATE
     NodeGraph::NodeGraph
-    imgui::imgui
     SDL2::SDL2main
     Zing::Zing
     ${PLATFORM_LINKLIBS}

app/demo.cpp

@@ -240,9 +240,10 @@ void demo_resize(const glm::vec2& size, IFontTexture* pFontTexture)
         spSocket->SetConstraints(glm::uvec2(LayoutConstraint::Preferred, LayoutConstraint::Expanding));
         spHorzLayout->AddChild(spSocket);
 
+        /*
         auto& settings = Zest::GlobalSettingsManager::Instance();
         auto theme = settings.GetCurrentTheme();
-        settings.Load(fs::path(NODEGRAPH_ROOT) / "theme.toml");
+        settings.Load(fs::path(NODEGRAPH_ROOT) / "theme.toml");*/
     }
     spCanvas->SetPixelRegionSize(size);
 }
@@ -405,9 +406,11 @@ void demo_cleanup()
 {
     Zing::audio_destroy();
 
+    /*
     auto& settings = Zest::GlobalSettingsManager::Instance();
     auto theme = settings.GetCurrentTheme();
     settings.Save(fs::path(NODEGRAPH_ROOT) / "theme.toml");
+    */
 
     spCanvas.reset();
 }

app/main.cpp

@@ -20,6 +20,7 @@
 
 #include <zest/logger/logger.h>
 #include <zest/settings/settings.h>
+#include <zest/time/profiler.h>
 
 #include <nodegraph/vulkan/vulkan_imgui_texture.h>
 #include <nodegraph/IconsFontAwesome5.h>
@@ -370,6 +371,8 @@ static void FramePresent(ImGui_ImplVulkanH_Window* wd)
 // A plain old vulkan window.  Just to get an IMGUI surface
 int main(int, char**)
 {
+    Zest::Profiler::Init();
+
     // Setup SDL
     if (SDL_Init(SDL_INIT_VIDEO | SDL_INIT_TIMER | SDL_INIT_GAMECONTROLLER) != 0)
     {

libs/zing

@@ -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] imgui[sdl2-binding,freetype,vulkan-binding] magic-enum catch2 --triplet x64-windows-static-md --recurse
+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
 cd %~dp0
 echo %Time%
 

prebuild.bat

@@ -13,7 +13,7 @@ if [ "$(uname)" == "Darwin" ]; then
 fi
 
 cd vcpkg
-./vcpkg install portaudio stb date tinydir fmt clipp tomlplusplus glm sdl2[vulkan] imgui[sdl2-binding,freetype,vulkan-binding] magic-enum catch2 --triplet ${triplet[0]} --recurse
+./vcpkg install portaudio stb date tinydir fmt clipp tomlplusplus glm sdl2[vulkan] magic-enum catch2 --triplet ${triplet[0]} --recurse
 if [ "$(uname)" != "Darwin" ]; then
 ./vcpkg install glib --triplet ${triplet[0]} --recurse
 fi

prebuild.sh

@@ -1,3 +1,57 @@
-['Default Setting']
+[themes.defaultTheme]
+b_debugShowLayout = false
 b_windowMaximized = true
+c_gridLines = [ 0.25, 0.25, 0.25, 1.0 ]
+c_knobChannelColor = [ 0.38040345907211304, 0.38040345907211304, 0.38040345907211304, 1.0 ]
+c_knobChannelHLColor = [ 0.8213256597518921, 0.1372821033000946, 0.1372821033000946, 1.0 ]
+c_knobFillColor = [ 0.45098039507865906, 0.45098039507865906, 0.45098039507865906, 1.0 ]
+c_knobFillHLColor = [ 0.4927954077720642, 0.4927954077720642, 0.4927954077720642, 1.0 ]
+c_knobMarkColor = [ 1.0, 1.0, 1.0, 1.0 ]
+c_knobMarkHLColor = [ 0.6941176652908325, 0.6823529601097107, 0.6823529601097107, 1.0 ]
+c_knobShadowColor = [ 0.2219020128250122, 0.2199835479259491, 0.2199835479259491, 1.0 ]
+c_knobTextColor = [ 0.8196078538894653, 0.8196078538894653, 0.8196078538894653, 1.0 ]
+c_nodeBorderColor = [ 0.0, 0.0, 0.0, 1.0 ]
+c_nodeCenterColor = [ 0.5, 0.5, 0.5, 1.0 ]
+c_nodeShadowColor = [ 0.10000000149011612, 0.10000000149011612, 0.10000000149011612, 0.5 ]
+c_nodeTitleBorderColor = [ 0.319884717464447, 0.319884717464447, 0.319884717464447, 1.0 ]
+c_nodeTitleCenterColor = [ 0.5936599373817444, 0.1779268980026245, 0.1779268980026245, 0.699999988079071 ]
+c_nodeTitleShadowColor = [ 0.19596540927886963, 0.19596540927886963, 0.19596540927886963, 1.0 ]
+c_sliderBorderColor = [ 0.29971182346343994, 0.29971182346343994, 0.29971182346343994, 1.0 ]
+c_sliderCenterColor = [ 0.10662823915481567, 0.0845036432147026, 0.0845036432147026, 1.0 ]
+c_sliderShadowColor = [ 0.0, 0.0, 0.0, 1.0 ]
+c_sliderThumbColor = [ 0.8443803787231445, 0.2920047342777252, 0.2920047342777252, 1.0 ]
+c_sliderThumbShadowColor = [ 0.0, 0.0, 0.0, 1.0 ]
+c_sliderTipBorderColor = [ 0.7665705680847168, 0.7665705680847168, 0.7665705680847168, 1.0 ]
+c_sliderTipCenterColor = [ 0.23054754734039307, 0.23054754734039307, 0.23054754734039307, 1.0 ]
+c_sliderTipFontColor = [ 0.6791103482246399, 0.7655288577079773, 0.8386167287826538, 1.0 ]
+c_sliderTipShadowColor = [ 0.10951006412506104, 0.10951006412506104, 0.10951006412506104, 1.0 ]
+c_socketColor = [ 0.0, 0.0, 0.0, 0.0 ]
+s_gridLineSize = 2.0
+s_knobChannelGap = 3.0
+s_knobChannelWidth = 8.0
+s_knobShadowSize = 3.0
+s_knobTextInset = 3.0
+s_knobTextSize = 24.0
+s_nodeBorderRadius = 4.0
+s_nodeBorderSize = 2.0
+s_nodeShadowSize = 2.0
+s_nodeTitleBorder = 0.0
+s_nodeTitleBorderRadius = 8.0
+s_nodeTitleBorderSize = 0.0
+s_nodeTitleFontPad = 2.0
+s_nodeTitlePad = 4.0
+s_nodeTitleShadowSize = 0.0
+s_nodeTitleSize = 26.0
+s_sliderBorderRadius = 4.0
+s_sliderBorderSize = 0.0
+s_sliderFontPad = 4.0
+s_sliderShadowSize = 3.0
+s_sliderThumbPad = 2.0
+s_sliderThumbRadius = 4.0
+s_sliderThumbShadowSize = 1.0
+s_sliderTipBorderRadius = 5.0
+s_sliderTipBorderSize = 0.0
+s_sliderTipFontPad = 7.0
+s_sliderTipFontSize = 36.0
+s_sliderTipShadowSize = 4.0
 s_windowSize = [ 3840.0, 2036.0 ]

settings.toml

@@ -6,10 +6,8 @@ project(NodeGraph
 find_package(glm CONFIG REQUIRED)
 find_package(Vulkan REQUIRED)
 find_package(fmt CONFIG REQUIRED)
- find_package(PkgConfig REQUIRED)
+find_package(PkgConfig REQUIRED)
 find_package(date CONFIG REQUIRED)
- 
-pkg_check_modules(tomlplusplus REQUIRED IMPORTED_TARGET tomlplusplus)
 
 set(NODEGRAPH_VULKAN_SOURCE
     ${NODEGRAPH_ROOT}/src/vulkan/vulkan_imgui_texture.cpp
@@ -59,7 +57,6 @@ add_library(NodeGraph::NodeGraph ALIAS NodeGraph)
 
 target_link_libraries(NodeGraph
 PRIVATE
-    PkgConfig::tomlplusplus
 PUBLIC
     Zing::Zing
     fmt::fmt-header-only
@@ -73,7 +70,6 @@ PRIVATE
     ${CMAKE_BINARY_DIR}
 PUBLIC
     $<BUILD_INTERFACE:${NODEGRAPH_ROOT}/include>
-    $<BUILD_INTERFACE:${NODEGRAPH_ROOT}/tomlplusplus/include>
     $<INSTALL_INTERFACE:include>
 )