From ced16a1bb9ef735a2fe44b64ac594bf9b4a7f9bf Mon Sep 17 00:00:00 2001 From: Dan Goodliffe Date: Wed, 19 Mar 2025 01:44:18 +0000 Subject: Replace basic rail builder UI with a ImGui version --- ui/editNetwork.cpp | 35 ++++++++++++++++++----------------- ui/editNetwork.h | 5 +---- ui/gameMainSelector.cpp | 2 +- ui/gameMainSelector.h | 2 +- ui/gameMainWindow.cpp | 32 ++++++++++++++++++++++++-------- 5 files changed, 45 insertions(+), 31 deletions(-) diff --git a/ui/editNetwork.cpp b/ui/editNetwork.cpp index 2887491..a11fe3c 100644 --- a/ui/editNetwork.cpp +++ b/ui/editNetwork.cpp @@ -2,6 +2,7 @@ #include "builders/freeExtend.h" #include "builders/join.h" #include "builders/straight.h" +#include "imgui_wrap.h" #include "text.h" #include #include @@ -11,16 +12,7 @@ const std::filesystem::path fontpath {"/usr/share/fonts/hack/Hack-Regular.ttf"}; constexpr const glm::u8vec4 TRANSPARENT_BLUE {30, 50, 255, 200}; -EditNetwork::EditNetwork(Network * n) : - network {n}, - builderToolbar { - {"ui/icon/network.png", mode.toggle()}, - {"ui/icon/network.png", mode.toggle()}, - {"ui/icon/network.png", mode.toggle()}, - }, - blue {1, 1, &TRANSPARENT_BLUE}, font {fontpath, 15} -{ -} +EditNetwork::EditNetwork(Network * n) : network {n}, blue {1, 1, &TRANSPARENT_BLUE}, font {fontpath, 15} { } bool EditNetwork::click(const SDL_MouseButtonEvent & e, const Ray & ray) @@ -42,9 +34,9 @@ EditNetwork::move(const SDL_MouseMotionEvent & e, const Ray & } bool -EditNetwork::handleInput(const SDL_Event & e, const UIComponent::Position & parentPos) +EditNetwork::handleInput(const SDL_Event &, const UIComponent::Position &) { - return builderToolbar.handleInput(e, parentPos); + return false; } void @@ -75,10 +67,19 @@ EditNetwork::Builder::setHeightsFor(Network * network, const Link::CCollection & } void -EditNetwork::render(const UIShader & shader, const UIComponent::Position & parentPos) const +EditNetwork::render(const UIShader &, const UIComponent::Position &) { - if (builder) { - Text {builder->hint(), font, {{50, 10}, {0, 15}}, {1, 1, 0}}.render(shader, parentPos); - } - builderToolbar.render(shader, parentPos); + ImGui::Begin("Edit Network"); + + auto builderChoice = [this](const char * name) { + if (ImGui::RadioButton(name, dynamic_cast(builder.get()))) { + builder = std::make_unique(); + } + }; + builderChoice.operator()("Straight"); + builderChoice.operator()("Join"); + builderChoice.operator()("Free Extend"); + ImGui::TextUnformatted(builder ? builder->hint().c_str() : "Select a build mode"); + + ImGui::End(); } diff --git a/ui/editNetwork.h b/ui/editNetwork.h index ae887bd..805e7ec 100644 --- a/ui/editNetwork.h +++ b/ui/editNetwork.h @@ -2,7 +2,6 @@ #include "game/geoData.h" #include "gameMainSelector.h" -#include "modeHelper.h" #include "toolbar.h" #include "worldOverlay.h" #include @@ -19,7 +18,7 @@ public: bool move(const SDL_MouseMotionEvent & e, const Ray &) override; bool handleInput(const SDL_Event & e, const UIComponent::Position &) override; void render(const SceneShader &, const Frustum &) const override; - void render(const UIShader & shader, const UIComponent::Position & pos) const override; + void render(const UIShader & shader, const UIComponent::Position & pos) override; using NetworkClickPos = std::variant; @@ -42,8 +41,6 @@ public: private: Network * network; Builder::Ptr builder; - Mode mode {builder}; - Toolbar builderToolbar; Texture blue; const Font font; }; diff --git a/ui/gameMainSelector.cpp b/ui/gameMainSelector.cpp index 23ae8c0..d5cbf62 100644 --- a/ui/gameMainSelector.cpp +++ b/ui/gameMainSelector.cpp @@ -110,7 +110,7 @@ GameMainSelector::Component::handleInput(const SDL_Event &, const Position &) } void -GameMainSelector::Component::render(const UIShader &, const UIComponent::Position &) const +GameMainSelector::Component::render(const UIShader &, const UIComponent::Position &) { } diff --git a/ui/gameMainSelector.h b/ui/gameMainSelector.h index e715823..16f70eb 100644 --- a/ui/gameMainSelector.h +++ b/ui/gameMainSelector.h @@ -23,7 +23,7 @@ public: virtual bool click(const SDL_MouseButtonEvent &, const Ray &); virtual bool move(const SDL_MouseMotionEvent &, const Ray &); virtual bool handleInput(const SDL_Event &, const Position & pos); - virtual void render(const UIShader & shader, const Position & pos) const; + virtual void render(const UIShader & shader, const Position & pos); virtual void render(const SceneShader &, const Frustum &) const; }; diff --git a/ui/gameMainWindow.cpp b/ui/gameMainWindow.cpp index d88bab5..c1e135b 100644 --- a/ui/gameMainWindow.cpp +++ b/ui/gameMainWindow.cpp @@ -1,10 +1,8 @@ #include "gameMainWindow.h" #include "editNetwork.h" #include "gameMainSelector.h" +#include "imgui_extras.h" #include "manualCameraController.h" -#include "modeHelper.h" -#include "toolbar.h" -#include "window.h" #include #include #include @@ -17,15 +15,33 @@ #include #include -class GameMainToolbar : Mode, public Toolbar { +class GameMainToolbar : public UIComponent { public: - explicit GameMainToolbar(GameMainSelector * gms_) : - Mode {gms_->target}, - Toolbar { - {"ui/icon/network.png", toggle>()}, + static constexpr auto TOOLBAR_HEIGHT = 54.F; + static constexpr ImVec2 TOOLBAR_ICON_SIZE {32, 32}; + + explicit GameMainToolbar(GameMainSelector * gms) : UIComponent {{{}, {}}}, gms {gms} { } + + void + render(const UIShader &, const Position &) const override + { + if (IltGui::BeginToolbar("bottomBar", ImGuiDir_Down, TOOLBAR_HEIGHT)) { + if (ImGui::ImageButton("Build rails", *buildRailsIcon, TOOLBAR_ICON_SIZE)) { + gms->target = std::make_unique>(); + } + IltGui::EndToolbar(); } + } + + bool + handleInput(const SDL_Event &, const Position &) override { + return false; } + +private: + Icon buildRailsIcon {"ui/icon/network.png"}; + GameMainSelector * gms; }; GameMainWindow::GameMainWindow(size_t w, size_t h) : WindowContent {w, h}, SceneRenderer {{w, h}, 0} -- cgit v1.2.3