feat: wire module switching, toolbar callbacks and fix Windows build

Author: LyeZinho

CMakeLists.txt

@@ -15,12 +15,26 @@ FetchContent_Declare(
 FetchContent_MakeAvailable(googletest)
 
 find_package(OpenGL QUIET)
-find_package(GLFW3 3.4 QUIET)
+
+# Try vcpkg config-mode first (when toolchain is active), then fall back to custom finders
+find_package(glfw3 CONFIG QUIET)
+if(glfw3_FOUND AND NOT TARGET GLFW3::GLFW3)
+  add_library(GLFW3::GLFW3 ALIAS glfw)
+  set(GLFW3_FOUND TRUE)
+else()
+  find_package(GLFW3 3.4 QUIET)
+endif()
+
 find_package(GLAD QUIET)
 find_package(ImGui QUIET)
 
 add_library(convoy_core)
-target_include_directories(convoy_core PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/src)
+target_include_directories(convoy_core PUBLIC 
+  ${CMAKE_CURRENT_SOURCE_DIR}/src
+  ${CMAKE_CURRENT_SOURCE_DIR}/third_party/imgui
+  ${CMAKE_CURRENT_SOURCE_DIR}/third_party/imgui/backends
+  ${CMAKE_CURRENT_SOURCE_DIR}/third_party/glad/include
+)
 
 if(GLFW3_FOUND AND OpenGL_FOUND AND GLAD_FOUND AND ImGui_FOUND)
   target_sources(convoy_core PRIVATE
@@ -29,13 +43,13 @@ if(GLFW3_FOUND AND OpenGL_FOUND AND GLAD_FOUND AND ImGui_FOUND)
     src/core/ui/theme_manager.cpp
     src/core/ui/dockspace_manager.cpp
     src/core/ui/main_menu_bar.cpp
+    src/core/ui/export_wizard.cpp
+    src/core/ui/preferences_window.cpp
+    src/core/ui/pressure_curve_editor.cpp
+    src/core/ui/new_project_dialog.cpp
     src/core/input/input_handler.cpp
     src/core/gfx/render_texture.cpp
-  )
-  target_include_directories(convoy_core PRIVATE
-    ${CMAKE_CURRENT_SOURCE_DIR}/third_party/imgui
-    ${CMAKE_CURRENT_SOURCE_DIR}/third_party/imgui/backends
-    ${CMAKE_CURRENT_SOURCE_DIR}/third_party/glad/include
+    src/core/keybind_manager.cpp
   )
   target_link_libraries(convoy_core PUBLIC
     GLFW3::GLFW3
@@ -46,6 +60,7 @@ if(GLFW3_FOUND AND OpenGL_FOUND AND GLAD_FOUND AND ImGui_FOUND)
   target_compile_definitions(convoy_core PRIVATE
     GLFW_INCLUDE_NONE
     IMGUI_IMPL_OPENGL_LOADER_GLAD
+    _CRT_SECURE_NO_WARNINGS
   )
 else()
   target_sources(convoy_core PRIVATE src/core/event_bus.cpp)
@@ -59,6 +74,8 @@ target_sources(convoy_core PRIVATE
   src/core/plugins/plugin_registry.cpp
   src/core/plugins/hook_system.cpp
   src/core/export/caf_exporter.cpp
+  src/core/settings_config.cpp
+  src/core/project_template.cpp
   src/shared/brush.cpp
 )
 

build.bat

@@ -0,0 +1,52 @@
+@echo off
+set CONFIG=Release
+if "%1"=="Debug" set CONFIG=Debug
+if "%1"=="debug" set CONFIG=Debug
+
+where cmake >nul 2>&1
+if not %errorlevel%==0 set "PATH=C:\Program Files\CMake\bin;%PATH%"
+
+cmake --version >nul 2>&1
+if not %errorlevel%==0 (
+    echo [ERROR] CMake not found
+    pause
+    exit /b 1
+)
+
+echo.
+echo Building Convoy - %CONFIG%
+echo.
+
+if not exist "build" mkdir build
+cd build
+
+echo [CONFIGURE] Running CMake...
+cmake .. -DCMAKE_BUILD_TYPE=%CONFIG% -DCMAKE_TOOLCHAIN_FILE=../vcpkg/scripts/buildsystems/vcpkg.cmake -DVCPKG_TARGET_TRIPLET=x64-windows-static-md
+
+if errorlevel 1 (
+    echo [ERROR] CMake configure failed, wiping cache and retrying...
+    cd ..
+    rmdir /s /q build 2>nul
+    mkdir build
+    cd build
+    cmake .. -DCMAKE_BUILD_TYPE=%CONFIG% -DCMAKE_TOOLCHAIN_FILE=../vcpkg/scripts/buildsystems/vcpkg.cmake -DVCPKG_TARGET_TRIPLET=x64-windows-static-md
+    if errorlevel 1 (
+        echo [ERROR] CMake configure failed
+        pause
+        exit /b 1
+    )
+)
+
+echo [BUILD] Compiling...
+cmake --build . --config %CONFIG% --parallel
+
+if errorlevel 1 (
+    echo [ERROR] Build failed
+    pause
+    exit /b 1
+)
+
+echo.
+echo [SUCCESS] Build complete!
+echo Executable: build\Release\Convoy.exe
+pause

build.sh

@@ -0,0 +1,36 @@
+#!/bin/bash
+set -e
+
+CONFIG="${1:-Release}"
+
+echo "========================================"
+echo "Building Convoy - $CONFIG"
+echo "========================================"
+
+if [ ! -d "build" ]; then
+    echo "[CREATE] Creating build directory..."
+    mkdir -p build
+fi
+
+cd build
+
+if command -v nproc &> /dev/null; then
+    CORES=$(nproc)
+elif command -v sysctl &> /dev/null; then
+    CORES=$(sysctl -n hw.ncpu)
+else
+    CORES=4
+fi
+
+echo "[CONFIGURE] Running CMake..."
+cmake .. -DCMAKE_BUILD_TYPE="$CONFIG"
+
+echo "[BUILD] Compiling ($CORES cores)..."
+cmake --build . --config "$CONFIG" --parallel "$CORES"
+
+echo ""
+echo "========================================"
+echo "[SUCCESS] Build complete!"
+echo "========================================"
+echo ""
+echo "Executable: build/Convoy"

src/convoy/main.cpp

@@ -3,7 +3,7 @@
 
 #include "core/window_manager.h"
 
-int main(int argc, char* argv[])
+int main(int /*argc*/, char* /*argv*/[])
 {
     try
     {

src/core/plugins/plugin_interface.h

@@ -35,7 +35,10 @@ class IBrushPlugin : public IConvoyPlugin
     virtual void on_stroke_update(float x, float y, float pressure) = 0;
     virtual void on_stroke_end() = 0;
 
-    virtual std::vector<uint8_t> generate_mask(int size, float pressure, float angle) const { return {}; }
+    virtual std::vector<uint8_t> generate_mask(int size, float pressure, float angle) const { 
+        (void)size; (void)pressure; (void)angle;
+        return {}; 
+    }
 
     virtual BrushShape get_shape() const { return BrushShape::Custom; }
 

src/core/ui/dockspace_manager.cpp

@@ -19,17 +19,15 @@ void DockSpaceManager::begin_frame() {
     ImGuiWindowFlags flags = ImGuiWindowFlags_NoTitleBar | ImGuiWindowFlags_NoCollapse |
         ImGuiWindowFlags_NoResize | ImGuiWindowFlags_NoMove |
         ImGuiWindowFlags_NoBringToFrontOnFocus | ImGuiWindowFlags_NoNavFocus |
-        ImGuiWindowFlags_NoBackground;
+        ImGuiWindowFlags_NoBackground | ImGuiWindowFlags_NoInputs;
 
     ImGui::PushStyleVar(ImGuiStyleVar_WindowRounding, 0.0f);
     ImGui::PushStyleVar(ImGuiStyleVar_WindowBorderSize, 0.0f);
     ImGui::PushStyleVar(ImGuiStyleVar_WindowPadding, ImVec2(0, 0));
     ImGui::Begin("##ConvoyShell", nullptr, flags);
     ImGui::PopStyleVar(3);
 
-    if (!initialized_) {
-        build_initial_layout();
-    }
+    render_snap_zone_overlays();
 }
 
 void DockSpaceManager::end_frame() {
@@ -38,92 +36,33 @@ void DockSpaceManager::end_frame() {
 
 ImGuiID DockSpaceManager::get_zone_id(DockZone zone) const {
     switch (zone) {
-        case DockZone::Toolbar:  return zone_toolbar_;
-        case DockZone::Canvas:   return zone_canvas_;
+        case DockZone::Toolbar:   return zone_toolbar_;
+        case DockZone::Canvas:    return zone_canvas_;
         case DockZone::Inspector: return zone_inspect_;
-        case DockZone::Bottom:  return zone_bottom_;
+        case DockZone::Bottom:    return zone_bottom_;
     }
     return 0;
 }
 
 void DockSpaceManager::build_initial_layout() {
-    ImGuiID main_id = ImGui::GetMainViewport()->ID;
-    ImGui::DockBuilderRemoveNode(main_id);
-    ImGui::DockBuilderAddNode(main_id, ImGuiDockNodeFlags_DockSpace);
-    root_id_ = main_id;
-
-    build_artisan_layout();
+    current_preset_ = LayoutPreset::Artisan;
     initialized_ = true;
 }
 
 void DockSpaceManager::build_artisan_layout() {
-    ImGuiID remaining = root_id_;
-
-    ImGuiID id_right = ImGui::DockBuilderSplitNode(remaining, ImGuiDir_Right, 0.20f, nullptr, &remaining);
-    ImGuiID id_left = ImGui::DockBuilderSplitNode(remaining, ImGuiDir_Left, 0.10f, nullptr, &remaining);
-    ImGuiID id_bottom = ImGui::DockBuilderSplitNode(remaining, ImGuiDir_Down, 0.15f, nullptr, &remaining);
-
-    ImGui::DockBuilderDockWindow("Architect", remaining);
-    ImGui::DockBuilderDockWindow("Inspector", id_right);
-    ImGui::DockBuilderDockWindow("Toolbar", id_left);
-    ImGui::DockBuilderDockWindow("Console", id_bottom);
-
-    ImGui::DockBuilderFinish(root_id_);
-
-    zone_toolbar_ = id_left;
-    zone_canvas_ = remaining;
-    zone_inspect_ = id_right;
-    zone_bottom_ = id_bottom;
     current_preset_ = LayoutPreset::Artisan;
 }
 
 void DockSpaceManager::build_level_design_layout() {
-    ImGui::DockBuilderRemoveNode(root_id_);
-    ImGui::DockBuilderAddNode(root_id_, ImGuiDockNodeFlags_DockSpace);
-
-    ImGuiID remaining = root_id_;
-
-    ImGuiID id_left = ImGui::DockBuilderSplitNode(remaining, ImGuiDir_Left, 0.20f, nullptr, &remaining);
-    ImGuiID id_right = ImGui::DockBuilderSplitNode(remaining, ImGuiDir_Right, 0.20f, nullptr, &remaining);
-
-    ImGui::DockBuilderDockWindow("Layers", id_left);
-    ImGui::DockBuilderDockWindow("Canvas", remaining);
-    ImGui::DockBuilderDockWindow("Tiles", id_right);
-
-    ImGui::DockBuilderFinish(root_id_);
-
-    zone_toolbar_ = id_left;
-    zone_canvas_ = remaining;
-    zone_inspect_ = id_right;
-    zone_bottom_ = 0;
     current_preset_ = LayoutPreset::LevelDesign;
 }
 
 void DockSpaceManager::build_debugging_layout() {
-    ImGui::DockBuilderRemoveNode(root_id_);
-    ImGui::DockBuilderAddNode(root_id_, ImGuiDockNodeFlags_DockSpace);
-
-    ImGuiID remaining = root_id_;
-
-    ImGuiID id_bottom = ImGui::DockBuilderSplitNode(remaining, ImGuiDir_Down, 0.30f, nullptr, &remaining);
-    ImGuiID id_right = ImGui::DockBuilderSplitNode(remaining, ImGuiDir_Right, 0.25f, nullptr, &remaining);
-
-    ImGui::DockBuilderDockWindow("Canvas", remaining);
-    ImGui::DockBuilderDockWindow("Properties", id_right);
-    ImGui::DockBuilderDockWindow("Console", id_bottom);
-
-    ImGui::DockBuilderFinish(root_id_);
-
-    zone_toolbar_ = 0;
-    zone_canvas_ = remaining;
-    zone_inspect_ = id_right;
-    zone_bottom_ = id_bottom;
     current_preset_ = LayoutPreset::Debugging;
 }
 
 void DockSpaceManager::switch_preset(LayoutPreset preset) {
     if (current_preset_ == preset) return;
-
     switch (preset) {
         case LayoutPreset::Artisan:     build_artisan_layout(); break;
         case LayoutPreset::LevelDesign: build_level_design_layout(); break;
@@ -142,4 +81,35 @@ void DockSpaceManager::load_layout() {
     initialized_ = false;
 }
 
-}  // namespace
+void DockSpaceManager::render_snap_zone_overlays() {
+    if (!show_snap_zones_) return;
+
+    ImGuiViewport* vp = ImGui::GetMainViewport();
+    float menu_h = ImGui::GetFrameHeight();
+    float x0 = vp->WorkPos.x;
+    float y0 = vp->WorkPos.y + menu_h;
+    float w  = vp->WorkSize.x;
+    float h  = vp->WorkSize.y - menu_h;
+
+    float toolbar_w   = w * 0.10f;
+    float inspector_w = w * 0.20f;
+    float bottom_h    = h * 0.15f;
+
+    ImU32 zone_col  = IM_COL32(64, 160, 255, 140);
+    ImU32 label_col = IM_COL32(64, 160, 255, 210);
+
+    ImDrawList* dl = ImGui::GetForegroundDrawList();
+    float t = 2.0f;
+
+    dl->AddRect({x0,                    y0},          {x0 + toolbar_w,             y0 + h - bottom_h}, zone_col, 0.0f, 0, t);
+    dl->AddRect({x0 + toolbar_w,        y0},          {x0 + w - inspector_w,       y0 + h - bottom_h}, zone_col, 0.0f, 0, t);
+    dl->AddRect({x0 + w - inspector_w,  y0},          {x0 + w,                     y0 + h - bottom_h}, zone_col, 0.0f, 0, t);
+    dl->AddRect({x0,                    y0 + h - bottom_h}, {x0 + w,               y0 + h},            zone_col, 0.0f, 0, t);
+
+    dl->AddText({x0 + 4,                    y0 + 4},              label_col, "Toolbar");
+    dl->AddText({x0 + toolbar_w + 4,        y0 + 4},              label_col, "Canvas");
+    dl->AddText({x0 + w - inspector_w + 4,  y0 + 4},              label_col, "Inspector");
+    dl->AddText({x0 + 4,                    y0 + h - bottom_h + 4}, label_col, "Console");
+}
+
+} // namespace convoy