Builds again, doesn't run yet

Author: cmaughan

.gitignore

@@ -25,6 +25,7 @@ tags
 bld/
 [Bb]in/
 [Oo]bj/
+build_llvm/**
 
 imgui.ini
 git_stats

app/demo.cpp

@@ -22,6 +22,7 @@ extern "C" {
 }
 
 #include <config_nodegraph_app.h>
+
 using namespace NodeGraph;
 using namespace Zest;
 namespace fs = std::filesystem;
@@ -239,7 +240,9 @@ void demo_resize(const glm::vec2& size, IFontTexture* pFontTexture)
         spSocket->SetConstraints(glm::uvec2(LayoutConstraint::Preferred, LayoutConstraint::Expanding));
         spHorzLayout->AddChild(spSocket);
 
-        ThemeManager::Instance().Load(fs::path(NODEGRAPH_ROOT) / "theme.toml");
+        auto& settings = Zest::GlobalSettingsManager::Instance();
+        auto theme = settings.GetCurrentTheme();
+        settings.Load(fs::path(NODEGRAPH_ROOT) / "theme.toml");
     }
     spCanvas->SetPixelRegionSize(size);
 }
@@ -296,10 +299,11 @@ void demo_theme_editor()
 {
     if (ImGui::Begin("Theme"))
     {
-        auto& theme = ThemeManager::Instance();
+        auto& settings = Zest::GlobalSettingsManager::Instance();
+        auto theme = settings.GetCurrentTheme();
         std::vector<Zest::StringId> themeNames;
 
-        for (auto& [mstr, val] : theme.m_themes[theme.m_currentSetting])
+        for (auto& [mstr, val] : settings.GetSection(theme))
         {
             themeNames.push_back(mstr);
         }
@@ -309,7 +313,7 @@ void demo_theme_editor()
         });
 
         std::string last;
-        auto& themeMap = theme.m_themes[theme.m_currentSetting];
+        auto& themeMap = settings.GetSection(theme);
         for (auto& id : themeNames)
         {
             auto name = id.ToString();
@@ -367,7 +371,7 @@ void demo_draw()
 
     demo_theme_editor();
     demo_hierarchy_editor();
-    Zing::audio_show_gui();
+    Zing::audio_show_settings_gui();
 
     ImGui::End();
 
@@ -400,6 +404,10 @@ void demo_draw()
 void demo_cleanup()
 {
     Zing::audio_destroy();
-    ThemeManager::Instance().Save(fs::path(NODEGRAPH_ROOT) / "theme.toml");
+
+    auto& settings = Zest::GlobalSettingsManager::Instance();
+    auto theme = settings.GetCurrentTheme();
+    settings.Save(fs::path(NODEGRAPH_ROOT) / "theme.toml");
+
     spCanvas.reset();
 }

app/main.cpp

@@ -11,7 +11,8 @@
 #include <stdlib.h> // abort
 #include <vulkan/vulkan.h>
 
-#include "config_nodegraph_app.h"
+#include <config_nodegraph_app.h>
+
 #include <filesystem>
 #include <fmt/format.h>
 
@@ -23,6 +24,7 @@
 #include <nodegraph/vulkan/vulkan_imgui_texture.h>
 #include <nodegraph/IconsFontAwesome5.h>
 #include <nodegraph/canvas.h>
+#include <nodegraph/theme.h>
 
 
 namespace fs = std::filesystem;
@@ -375,18 +377,19 @@ int main(int, char**)
         return -1;
     }
 
-    auto& settings = Zest::GlobalSettingManager::Instance();
+    auto& settings = Zest::GlobalSettingsManager::Instance();
+    auto theme = settings.GetCurrentTheme();
 
     settings.Load(fs::path(NODEGRAPH_ROOT) / "settings.toml");
 
-    auto windowSize = settings.GetVec2f(Zest::s_windowSize);
+    auto windowSize = settings.GetVec2f(theme, Zest::s_windowSize);
     if (windowSize.x == 0 || windowSize.y == 0)
     {
         windowSize.x = 1280;
         windowSize.y = 720;
     }
 
-    bool max = settings.GetBool(Zest::b_windowMaximized);
+    bool max = settings.GetBool(theme, Zest::b_windowMaximized);
 
     // Setup window
     SDL_WindowFlags window_flags = (SDL_WindowFlags)(SDL_WINDOW_VULKAN | SDL_WINDOW_RESIZABLE | SDL_WINDOW_ALLOW_HIGHDPI);
@@ -629,13 +632,13 @@ int main(int, char**)
     CleanupVulkan();
 
     SDL_GetWindowSize(window, &w, &h);
-    settings.Set(Zest::s_windowSize, glm::vec2(w, h));
-    settings.Set(Zest::b_windowMaximized, bool(SDL_GetWindowFlags(window) & SDL_WINDOW_MAXIMIZED));
+    settings.Set(theme, Zest::s_windowSize, glm::vec2(w, h));
+    settings.Set(theme, Zest::b_windowMaximized, bool(SDL_GetWindowFlags(window) & SDL_WINDOW_MAXIMIZED));
 
     SDL_DestroyWindow(window);
     SDL_Quit();
 
-    Zest::GlobalSettingManager::Instance().Save(fs::path(NODEGRAPH_ROOT) / "settings.toml");
+    Zest::GlobalSettingsManager::Instance().Save(fs::path(NODEGRAPH_ROOT) / "settings.toml");
 
     return 0;
 }

compile_commands.json

@@ -5,16 +5,6 @@
 namespace NodeGraph
 {
 
-class ThemeManager : public Zest::SettingsManager
-{
-public:
-    static ThemeManager& Instance()
-    {
-        static ThemeManager theme;
-        return theme;
-    }
-};
-
 #ifdef DECLARE_THEME_SETTINGS
 #define DECLARE_THEME_SETTING_VALUE(name) Zest::StringId name(#name);
 #else

include/nodegraph/theme.h

@@ -32,29 +32,30 @@ Canvas::Canvas(IFontTexture* pFontTexture, float worldScale, const glm::vec2& sc
     spFontContext = std::make_shared<FontContext>();
     fonts_init(*spFontContext, pFontTexture);
 
-    auto& theme = ThemeManager::Instance();
+    auto& settings = Zest::GlobalSettingsManager::Instance();
+    auto theme = settings.GetCurrentTheme();
 
     // For connectors around side
-    // theme.Set(s_nodeOuter, 20.0f);
+    // settings.Set(s_nodeOuter, 20.0f);
 
     float margin = 2.0f;
 
     // Title and padding
-    theme.Set(s_nodeTitleSize, 26.0f);
-    theme.Set(s_nodeTitleFontPad, 2.0f);
-    theme.Set(s_nodeBorderRadius, 4.0f);
-    theme.Set(s_nodeTitleBorderRadius, 8.0f);
-    theme.Set(s_nodeShadowSize, 4.0f);
+    settings.Set(theme, s_nodeTitleSize, 26.0f);
+    settings.Set(theme, s_nodeTitleFontPad, 2.0f);
+    settings.Set(theme, s_nodeBorderRadius, 4.0f);
+    settings.Set(theme, s_nodeTitleBorderRadius, 8.0f);
+    settings.Set(theme, s_nodeShadowSize, 4.0f);
 
-    theme.Set(s_nodeShadowSize, 2.0f);
-    theme.Set(c_nodeShadowColor, glm::vec4(0.1f, 0.1f, 0.1f, 0.5f));
-    theme.Set(c_nodeCenterColor, glm::vec4(0.5f, 0.5f, 0.5f, 1.0f));
+    settings.Set(theme, s_nodeShadowSize, 2.0f);
+    settings.Set(theme, c_nodeShadowColor, glm::vec4(0.1f, 0.1f, 0.1f, 0.5f));
+    settings.Set(theme, c_nodeCenterColor, glm::vec4(0.5f, 0.5f, 0.5f, 1.0f));
 
-    theme.Set(s_gridLineSize, 2.0f);
+    settings.Set(theme, s_gridLineSize, 2.0f);
 
-    theme.Set(c_gridLines, glm::vec4(0.25f, 0.25f, 0.25f, 1.0f));
+    settings.Set(theme, c_gridLines, glm::vec4(0.25f, 0.25f, 0.25f, 1.0f));
 
-    theme.Set(c_nodeTitleCenterColor, glm::vec4(0.2f, 0.2f, 0.2f, 0.7f));
+    settings.Set(theme, c_nodeTitleCenterColor, glm::vec4(0.2f, 0.2f, 0.2f, 0.7f));
 }
 
 Canvas::~Canvas()
@@ -194,14 +195,15 @@ void Canvas::HandleMouse()
 
 void Canvas::DrawGrid(float worldStep)
 {
-    auto& theme = ThemeManager::Instance();
+    auto& settings = Zest::GlobalSettingsManager::Instance();
+    auto theme = settings.GetCurrentTheme();
 
     auto startPos = m_worldOrigin;
     startPos.x = std::floor(m_worldOrigin.x / worldStep) * worldStep;
     startPos.y = std::floor(m_worldOrigin.y / worldStep) * worldStep;
 
-    auto size = (theme.GetVec2f(s_gridLineSize) / m_worldScale);
-    auto lineColor = theme.GetVec4f(c_gridLines);
+    auto size = (settings.GetVec2f(theme, s_gridLineSize) / m_worldScale);
+    auto lineColor = settings.GetVec4f(theme, c_gridLines);
 
     while (startPos.x < PixelToWorld(m_pixelSize).x)
     {

libs/zing

@@ -6,7 +6,7 @@
 #include <nodegraph/fonts.h>
 #include <nodegraph/nodegraph.h>
 
-#include "config_nodegraph_app.h"
+#include <config_nodegraph_app.h>
 
 namespace fs = std::filesystem;
 

src/canvas.cpp

@@ -263,8 +263,9 @@ const WidgetList& Layout::GetChildren() const
 
 void Layout::Draw(Canvas& canvas)
 {
-    auto& theme = ThemeManager::Instance();
-    if (theme.GetBool(b_debugShowLayout))
+    auto& settings = Zest::GlobalSettingsManager::Instance();
+    auto theme = settings.GetCurrentTheme();
+    if (settings.GetBool(theme, b_debugShowLayout))
     {
         if (m_layoutType == LayoutType::Horizontal)
         {

src/canvas_imgui.cpp

@@ -1,3 +1,5 @@
+#include <zest/settings/settings.h>
+
 #include <nodegraph/canvas.h>
 #include <nodegraph/theme.h>
 #include <nodegraph/widgets/node.h>
@@ -13,39 +15,40 @@ Node::Node(const std::string& label)
 
 void Node::Draw(Canvas& canvas)
 {
-    auto& theme = ThemeManager::Instance();
+    auto& settings = Zest::GlobalSettingsManager::Instance();
+    auto theme = settings.GetCurrentTheme();
     Widget::Draw(canvas);
 
     auto rcWorld = GetWorldRect();
 
     rcWorld = DrawSlab(canvas,
         rcWorld,
-        theme.GetFloat(s_nodeBorderRadius),
-        theme.GetFloat(s_nodeShadowSize),
-        theme.GetVec4f(c_nodeShadowColor),
-        theme.GetFloat(s_nodeBorderSize),
-        theme.GetVec4f(c_nodeBorderColor),
-        theme.GetVec4f(c_nodeCenterColor));
+        settings.GetFloat(theme, s_nodeBorderRadius),
+        settings.GetFloat(theme, s_nodeShadowSize),
+        settings.GetVec4f(theme, c_nodeShadowColor),
+        settings.GetFloat(theme, s_nodeBorderSize),
+        settings.GetVec4f(theme, c_nodeBorderColor),
+        settings.GetVec4f(theme, c_nodeCenterColor));
 
-    auto fontSize = theme.GetFloat(s_nodeTitleSize);
-    auto titleHeight = fontSize + theme.GetFloat(s_nodeTitleFontPad) * 2.0f;
-    auto titlePad = theme.GetFloat(s_nodeTitlePad);
+    auto fontSize = settings.GetFloat(theme, s_nodeTitleSize);
+    auto titleHeight = fontSize + settings.GetFloat(theme, s_nodeTitleFontPad) * 2.0f;
+    auto titlePad = settings.GetFloat(theme, s_nodeTitlePad);
 
     auto titlePanelRect = NRectf(rcWorld.Left() + titlePad, rcWorld.Top() + titlePad, rcWorld.Width() - titlePad * 2.0f, titleHeight);
 
     rcWorld = DrawSlab(canvas,
         titlePanelRect,
-        theme.GetFloat(s_nodeTitleBorderRadius),
-        theme.GetFloat(s_nodeTitleShadowSize),
-        theme.GetVec4f(c_nodeTitleShadowColor),
-        theme.GetFloat(s_nodeTitleBorderSize),
-        theme.GetVec4f(c_nodeTitleBorderColor),
-        theme.GetVec4f(c_nodeTitleCenterColor),
+        settings.GetFloat(theme, s_nodeTitleBorderRadius),
+        settings.GetFloat(theme, s_nodeTitleShadowSize),
+        settings.GetVec4f(theme, c_nodeTitleShadowColor),
+        settings.GetFloat(theme, s_nodeTitleBorderSize),
+        settings.GetVec4f(theme, c_nodeTitleBorderColor),
+        settings.GetVec4f(theme, c_nodeTitleCenterColor),
         m_label.c_str(),
-        theme.GetFloat(s_nodeTitleFontPad),
-        TextColorForBackground(theme.GetVec4f(c_nodeTitleCenterColor)));
+        settings.GetFloat(theme, s_nodeTitleFontPad),
+        TextColorForBackground(settings.GetVec4f(theme, c_nodeTitleCenterColor)));
 
-    auto bottomGap = theme.GetFloat(s_nodeBorderSize) + theme.GetFloat(s_nodeShadowSize);
+    auto bottomGap = settings.GetFloat(theme, s_nodeBorderSize) + settings.GetFloat(theme, s_nodeShadowSize);
 
     // Layout in child coordinates
     auto layoutRect = NRectf(titlePanelRect.Left(), titlePanelRect.Bottom(), titlePanelRect.Width(), GetWorldRect().Bottom() - bottomGap - titlePanelRect.Bottom());