From 176f5b2aa1e5b08e6bd11272f0823532bd923e47 Mon Sep 17 00:00:00 2001 From: Orange Date: Sat, 11 Jul 2026 18:05:20 +0300 Subject: [PATCH 1/9] gradient text + box fill --- examples/example_hud/gui/main_window.cpp | 46 ++++++- examples/example_hud/gui/main_window.hpp | 15 ++- include/omath/hud/entity_overlay.hpp | 39 +++--- include/omath/hud/entity_overlay_widgets.hpp | 20 ++- include/omath/hud/gradient.hpp | 13 ++ include/omath/hud/hud_renderer_interface.hpp | 13 ++ .../renderer_realizations/imgui_renderer.hpp | 9 +- source/hud/entity_overlay.cpp | 114 ++++++++++-------- .../renderer_realizations/imgui_renderer.cpp | 49 ++++++-- 9 files changed, 232 insertions(+), 86 deletions(-) create mode 100644 include/omath/hud/gradient.hpp diff --git a/examples/example_hud/gui/main_window.cpp b/examples/example_hud/gui/main_window.cpp index e6537154..ab34eee3 100644 --- a/examples/example_hud/gui/main_window.cpp +++ b/examples/example_hud/gui/main_window.cpp @@ -4,6 +4,7 @@ #include "main_window.hpp" #include "omath/hud/renderer_realizations/imgui_renderer.hpp" #include +#include #include #include #include @@ -83,6 +84,15 @@ namespace imgui_desktop::gui ImGui::Checkbox("Dashed", &m_show_dashed_box); ImGui::ColorEdit4("Color##box", reinterpret_cast(&m_box_color), ImGuiColorEditFlags_NoInputs); ImGui::ColorEdit4("Fill##box", reinterpret_cast(&m_box_fill), ImGuiColorEditFlags_NoInputs); + ImGui::Checkbox("Gradient fill", &m_gradient_box_fill); + ImGui::Checkbox("Animate gradients", &m_animate_gradients); + if (m_gradient_box_fill) + { + ImGui::ColorEdit4("Gradient top##box", reinterpret_cast(&m_box_gradient_top), + ImGuiColorEditFlags_NoInputs); + ImGui::ColorEdit4("Gradient bottom##box", reinterpret_cast(&m_box_gradient_bottom), + ImGuiColorEditFlags_NoInputs); + } ImGui::ColorEdit4("Outline##box", reinterpret_cast(&m_box_outline), ImGuiColorEditFlags_NoInputs); ImGui::SliderFloat("Thickness", &m_box_thickness, 0.5f, 5.f); ImGui::SliderFloat("Corner ratio", &m_corner_ratio, 0.05f, 0.5f); @@ -121,6 +131,14 @@ namespace imgui_desktop::gui if (ImGui::CollapsingHeader("Labels", ImGuiTreeNodeFlags_DefaultOpen)) { ImGui::Checkbox("Outlined", &m_outlined); + ImGui::Checkbox("Gradient centered label", &m_gradient_label); + if (m_gradient_label) + { + ImGui::ColorEdit4("Gradient left##lbl", reinterpret_cast(&m_label_gradient_left), + ImGuiColorEditFlags_NoInputs); + ImGui::ColorEdit4("Gradient right##lbl", reinterpret_cast(&m_label_gradient_right), + ImGuiColorEditFlags_NoInputs); + } ImGui::SliderFloat("Offset##lbl", &m_label_offset, 0.f, 15.f); ImGui::Checkbox("Right##lbl", &m_show_right_labels); ImGui::SameLine(); @@ -196,6 +214,28 @@ namespace imgui_desktop::gui const Bar bar{m_bar_color, m_bar_outline_color, m_bar_bg_color, m_bar_width, m_bar_value, m_bar_offset}; const DashedBar dbar{m_bar_color, m_bar_outline_color, m_bar_bg_color, m_bar_width, m_bar_value, m_bar_dash_len, m_bar_dash_gap, m_bar_offset}; + const auto animated_color = [&](const omath::Color& color, const float hue_offset) + { + if (!m_animate_gradients) + return color; + + auto hsv = color.to_hsv(); + hsv.hue = std::fmod(hsv.hue + static_cast(ImGui::GetTime()) * 0.15f + hue_offset, 1.f); + const auto animated = omath::Color::from_hsv(hsv).value(); + return omath::Color{animated.x, animated.y, animated.z, color.value().w}; + }; + const auto box_gradient_top = animated_color(m_box_gradient_top, 0.f); + const auto box_gradient_bottom = animated_color(m_box_gradient_bottom, 0.5f); + const auto label_gradient_left = animated_color(m_label_gradient_left, 0.f); + const auto label_gradient_right = animated_color(m_label_gradient_right, 0.5f); + const Paint box_fill = m_gradient_box_fill + ? Paint{omath::hud::Gradient{box_gradient_top, box_gradient_top, + box_gradient_bottom, box_gradient_bottom}} + : Paint{m_box_fill}; + const Paint centered_label_color = + m_gradient_label ? Paint{omath::hud::Gradient{label_gradient_left, label_gradient_right, + label_gradient_right, label_gradient_left}} + : Paint{omath::Color::from_rgba(255, 255, 255, 255)}; auto outline_helper = [](const bool is_outline) -> Outlined { @@ -205,7 +245,7 @@ namespace imgui_desktop::gui std::make_shared()) .contents( // ── Boxes ──────────────────────────────────────────────────── - when(m_show_box, Box{m_box_color, m_box_fill, m_box_outline, m_box_thickness}), + when(m_show_box, Box{m_box_color, box_fill, m_box_outline, m_box_thickness}), when(m_show_cornered_box, CorneredBox{omath::Color::from_rgba(255, 0, 255, 255), m_box_fill, m_box_outline, m_corner_ratio, m_box_thickness}), when(m_show_dashed_box, DashedBox{m_dash_color, m_dash_len, m_dash_gap, m_dash_thickness}), @@ -254,8 +294,8 @@ namespace imgui_desktop::gui when(m_show_bottom_bar, bar), when(m_show_bottom_dashed_bar, dbar), when(m_show_centered_bottom, - Centered{Label{omath::Color::from_rgba(255, 255, 255, 255), m_label_offset, - outline_helper(m_outlined), "PlayerName"}}), + Centered{Label{centered_label_color, m_label_offset, outline_helper(m_outlined), + "Gradient PlayerName"}}), when(m_show_bottom_labels, Label{omath::Color::from_rgba(200, 200, 0, 255), m_label_offset, outline_helper(m_outlined), "42m"}), }, diff --git a/examples/example_hud/gui/main_window.hpp b/examples/example_hud/gui/main_window.hpp index da88d900..a2bb7a79 100644 --- a/examples/example_hud/gui/main_window.hpp +++ b/examples/example_hud/gui/main_window.hpp @@ -30,8 +30,12 @@ namespace imgui_desktop::gui // Box omath::Color m_box_color{1.f, 1.f, 1.f, 1.f}; omath::Color m_box_fill{0.f, 0.f, 0.f, 0.f}; + omath::Color m_box_gradient_top{0.1f, 0.6f, 1.f, 0.55f}; + omath::Color m_box_gradient_bottom{0.7f, 0.1f, 1.f, 0.15f}; omath::Color m_box_outline{0.f, 0.f, 0.f, 0.f}; float m_box_thickness = 1.f, m_corner_ratio = 0.2f; + bool m_gradient_box_fill = true; + bool m_animate_gradients = false; bool m_show_box = true, m_show_cornered_box = true, m_show_dashed_box = false; // Dashed box @@ -43,17 +47,20 @@ namespace imgui_desktop::gui omath::Color m_bar_bg_color{0.f, 0.f, 0.f, 0.5f}; omath::Color m_bar_outline_color{0.f, 0.f, 0.f, 1.f}; float m_bar_width = 4.f, m_bar_value = 0.75f, m_bar_offset = 5.f; - bool m_show_right_bar = true, m_show_left_bar = true; - bool m_show_top_bar = true, m_show_bottom_bar = true; + bool m_show_right_bar = true, m_show_left_bar = true; + bool m_show_top_bar = true, m_show_bottom_bar = true; bool m_show_right_dashed_bar = false, m_show_left_dashed_bar = false; - bool m_show_top_dashed_bar = false, m_show_bottom_dashed_bar = false; + bool m_show_top_dashed_bar = false, m_show_bottom_dashed_bar = false; float m_bar_dash_len = 6.f, m_bar_dash_gap = 4.f; // Labels float m_label_offset = 3.f; + omath::Color m_label_gradient_left{0.f, 0.8f, 1.f, 1.f}; + omath::Color m_label_gradient_right{1.f, 0.2f, 0.7f, 1.f}; bool m_outlined = true; + bool m_gradient_label = true; bool m_show_right_labels = true, m_show_left_labels = true; - bool m_show_top_labels = true, m_show_bottom_labels = true; + bool m_show_top_labels = true, m_show_bottom_labels = true; bool m_show_centered_top = true, m_show_centered_bottom = true; // Skeleton diff --git a/include/omath/hud/entity_overlay.hpp b/include/omath/hud/entity_overlay.hpp index a7cb5743..723c8953 100644 --- a/include/omath/hud/entity_overlay.hpp +++ b/include/omath/hud/entity_overlay.hpp @@ -30,6 +30,9 @@ namespace omath::hud EntityOverlay& add_2d_box(const Color& box_color, const Color& fill_color = Color{0.f, 0.f, 0.f, 0.f}, const Color& outline_color = Color{0.f, 0.f, 0.f, 0.f}, float thickness = 1.f); + EntityOverlay& add_2d_box(const Color& box_color, const Gradient& fill_gradient, + const Color& outline_color = Color{0.f, 0.f, 0.f, 0.f}, float thickness = 1.f); + EntityOverlay& add_cornered_2d_box(const Color& box_color, const Color& fill_color = Color{0.f, 0.f, 0.f, 0.f}, const Color& outline_color = Color{0.f, 0.f, 0.f, 0.f}, float corner_ratio_len = 0.2f, float thickness = 1.f); @@ -65,26 +68,27 @@ namespace omath::hud float offset = 5.f); // ── Labels ─────────────────────────────────────────────────────── - EntityOverlay& add_right_label(const Color& color, float offset, widget::Outlined outlined, + EntityOverlay& add_right_label(const widget::Paint& color, float offset, widget::Outlined outlined, const std::string_view& text); - EntityOverlay& add_left_label(const Color& color, float offset, widget::Outlined outlined, + EntityOverlay& add_left_label(const widget::Paint& color, float offset, widget::Outlined outlined, const std::string_view& text); - EntityOverlay& add_top_label(const Color& color, float offset, widget::Outlined outlined, + EntityOverlay& add_top_label(const widget::Paint& color, float offset, widget::Outlined outlined, std::string_view text); - EntityOverlay& add_bottom_label(const Color& color, float offset, widget::Outlined outlined, + EntityOverlay& add_bottom_label(const widget::Paint& color, float offset, widget::Outlined outlined, std::string_view text); - EntityOverlay& add_centered_top_label(const Color& color, float offset, widget::Outlined outlined, + EntityOverlay& add_centered_top_label(const widget::Paint& color, float offset, widget::Outlined outlined, const std::string_view& text); - EntityOverlay& add_centered_bottom_label(const Color& color, float offset, widget::Outlined outlined, + EntityOverlay& add_centered_bottom_label(const widget::Paint& color, float offset, widget::Outlined outlined, const std::string_view& text); template - EntityOverlay& add_right_label(const Color& color, const float offset, const widget::Outlined outlined, + requires(sizeof...(Args) > 0) + EntityOverlay& add_right_label(const widget::Paint& color, const float offset, const widget::Outlined outlined, std::format_string fmt, Args&&... args) { return add_right_label(color, offset, outlined, @@ -92,7 +96,8 @@ namespace omath::hud } template - EntityOverlay& add_left_label(const Color& color, const float offset, const widget::Outlined outlined, + requires(sizeof...(Args) > 0) + EntityOverlay& add_left_label(const widget::Paint& color, const float offset, const widget::Outlined outlined, std::format_string fmt, Args&&... args) { return add_left_label(color, offset, outlined, @@ -100,7 +105,8 @@ namespace omath::hud } template - EntityOverlay& add_top_label(const Color& color, const float offset, const widget::Outlined outlined, + requires(sizeof...(Args) > 0) + EntityOverlay& add_top_label(const widget::Paint& color, const float offset, const widget::Outlined outlined, std::format_string fmt, Args&&... args) { return add_top_label(color, offset, outlined, @@ -108,7 +114,8 @@ namespace omath::hud } template - EntityOverlay& add_bottom_label(const Color& color, const float offset, const widget::Outlined outlined, + requires(sizeof...(Args) > 0) + EntityOverlay& add_bottom_label(const widget::Paint& color, const float offset, const widget::Outlined outlined, std::format_string fmt, Args&&... args) { return add_bottom_label(color, offset, outlined, @@ -116,15 +123,18 @@ namespace omath::hud } template - EntityOverlay& add_centered_top_label(const Color& color, const float offset, const widget::Outlined outlined, - std::format_string fmt, Args&&... args) + requires(sizeof...(Args) > 0) + EntityOverlay& add_centered_top_label(const widget::Paint& color, const float offset, + const widget::Outlined outlined, std::format_string fmt, + Args&&... args) { return add_centered_top_label(color, offset, outlined, std::string_view{std::vformat(fmt.get(), std::make_format_args(args...))}); } template - EntityOverlay& add_centered_bottom_label(const Color& color, const float offset, + requires(sizeof...(Args) > 0) + EntityOverlay& add_centered_bottom_label(const widget::Paint& color, const float offset, const widget::Outlined outlined, std::format_string fmt, Args&&... args) { @@ -242,7 +252,8 @@ namespace omath::hud void dispatch(const widget::AimDot& aim_dot); void dispatch(const widget::ProjectileAim& proj_widget); void draw_progress_ring(const Vector2& center, const widget::ProgressRing& ring); - void draw_outlined_text(const Vector2& position, const Color& color, const std::string_view& text); + void draw_label(const Vector2& position, const widget::Paint& paint, widget::Outlined outlined, + const std::string_view& text); void draw_dashed_line(const Vector2& from, const Vector2& to, const Color& color, float dash_len, float gap_len, float thickness) const; void draw_dashed_fill(const Vector2& origin, const Vector2& step_dir, diff --git a/include/omath/hud/entity_overlay_widgets.hpp b/include/omath/hud/entity_overlay_widgets.hpp index 6b2e300e..3d2d4fd4 100644 --- a/include/omath/hud/entity_overlay_widgets.hpp +++ b/include/omath/hud/entity_overlay_widgets.hpp @@ -2,6 +2,7 @@ // Created by orange on 15.03.2026. // #pragma once +#include "gradient.hpp" #include "omath/linear_algebra/vector2.hpp" #include "omath/utility/color.hpp" #include @@ -12,6 +13,16 @@ namespace omath::hud::widget { + struct Paint : std::variant + { + using std::variant::variant; + + constexpr Paint(const float red, const float green, const float blue, const float alpha) + : std::variant(Color{red, green, blue, alpha}) + { + } + }; + // ── Overloaded helper for std::visit ────────────────────────────────────── template struct Overloaded : Ts... @@ -25,7 +36,7 @@ namespace omath::hud::widget struct Box { Color color; - Color fill{0.f, 0.f, 0.f, 0.f}; + Paint fill{Color{0.f, 0.f, 0.f, 0.f}}; Color outline{0.f, 0.f, 0.f, 0.f}; float thickness = 1.f; }; @@ -92,7 +103,6 @@ namespace omath::hud::widget Figure figure = Figure::SQUARE; }; - // ── Side-agnostic widgets (used inside XxxSide containers) ──────────────── /// A filled bar. `size` is width for left/right sides, height for top/bottom. @@ -121,7 +131,7 @@ namespace omath::hud::widget struct Label { - Color color; + Paint color; float offset; Outlined outlined; std::string_view text; @@ -172,8 +182,8 @@ namespace omath::hud::widget struct None { }; ///< No-op placeholder — used by widget::when for disabled elements. - using SideWidget = - std::variant, SpaceVertical, SpaceHorizontal, ProgressRing, Icon>; + using SideWidget = std::variant, SpaceVertical, SpaceHorizontal, + ProgressRing, Icon>; // ── Side containers ─────────────────────────────────────────────────────── // Storing std::initializer_list is safe here: the backing array diff --git a/include/omath/hud/gradient.hpp b/include/omath/hud/gradient.hpp new file mode 100644 index 00000000..419dbc93 --- /dev/null +++ b/include/omath/hud/gradient.hpp @@ -0,0 +1,13 @@ +#pragma once +#include "omath/utility/color.hpp" + +namespace omath::hud +{ + struct Gradient + { + Color top_left; + Color top_right; + Color bottom_right; + Color bottom_left; + }; +} // namespace omath::hud diff --git a/include/omath/hud/hud_renderer_interface.hpp b/include/omath/hud/hud_renderer_interface.hpp index 5a25e036..3ebc5f41 100644 --- a/include/omath/hud/hud_renderer_interface.hpp +++ b/include/omath/hud/hud_renderer_interface.hpp @@ -2,6 +2,7 @@ // Created by orange on 13.03.2026. // #pragma once +#include "gradient.hpp" #include "omath/linear_algebra/vector2.hpp" #include "omath/utility/color.hpp" #include @@ -25,6 +26,12 @@ namespace omath::hud virtual void add_filled_rectangle(const Vector2& min, const Vector2& max, const Color& color) = 0; + virtual void add_gradient_rectangle(const Vector2& min, const Vector2& max, + const Gradient& gradient) + { + add_filled_rectangle(min, max, gradient.top_left); + } + virtual void add_circle(const Vector2& center, float radius, const Color& color, float thickness, int segments = 0) = 0; @@ -41,6 +48,12 @@ namespace omath::hud virtual void add_text(const Vector2& position, const Color& color, const std::string_view& text) = 0; + virtual void add_gradient_text(const Vector2& position, const Gradient& gradient, + const std::string_view& text) + { + add_text(position, gradient.top_left, text); + } + [[nodiscard]] virtual Vector2 calc_text_size(const std::string_view& text) = 0; }; diff --git a/include/omath/hud/renderer_realizations/imgui_renderer.hpp b/include/omath/hud/renderer_realizations/imgui_renderer.hpp index a7e13647..6632a487 100644 --- a/include/omath/hud/renderer_realizations/imgui_renderer.hpp +++ b/include/omath/hud/renderer_realizations/imgui_renderer.hpp @@ -13,10 +13,13 @@ namespace omath::hud ~ImguiHudRenderer() override; void add_line(const Vector2& line_start, const Vector2& line_end, const Color& color, float thickness) override; - void add_polyline(const std::span>& vertexes, const Color& color, float thickness) override; + void add_polyline(const std::span>& vertexes, const Color& color, + float thickness) override; void add_filled_polyline(const std::span>& vertexes, const Color& color) override; void add_rectangle(const Vector2& min, const Vector2& max, const Color& color) override; void add_filled_rectangle(const Vector2& min, const Vector2& max, const Color& color) override; + void add_gradient_rectangle(const Vector2& min, const Vector2& max, + const Gradient& gradient) override; void add_circle(const Vector2& center, float radius, const Color& color, float thickness, int segments = 0) override; void add_filled_circle(const Vector2& center, float radius, const Color& color, @@ -26,8 +29,10 @@ namespace omath::hud void add_image(const std::any& texture_id, const Vector2& min, const Vector2& max, const Color& tint = Color{1.f, 1.f, 1.f, 1.f}) override; void add_text(const Vector2& position, const Color& color, const std::string_view& text) override; + void add_gradient_text(const Vector2& position, const Gradient& gradient, + const std::string_view& text) override; [[nodiscard]] Vector2 calc_text_size(const std::string_view& text) override; }; } // namespace omath::hud -#endif // OMATH_IMGUI_INTEGRATION \ No newline at end of file +#endif // OMATH_IMGUI_INTEGRATION diff --git a/source/hud/entity_overlay.cpp b/source/hud/entity_overlay.cpp index 244351f4..98d570a7 100644 --- a/source/hud/entity_overlay.cpp +++ b/source/hud/entity_overlay.cpp @@ -20,6 +20,20 @@ namespace omath::hud return *this; } + + EntityOverlay& EntityOverlay::add_2d_box(const Color& box_color, const Gradient& fill_gradient, + const Color& outline_color, const float thickness) + { + const auto points = m_canvas.as_array(); + + if (outline_color.value().w > 0.f) + m_renderer->add_polyline({points.data(), points.size()}, outline_color, thickness + 2.f); + + m_renderer->add_polyline({points.data(), points.size()}, box_color, thickness); + m_renderer->add_gradient_rectangle(m_canvas.top_left_corner, m_canvas.bottom_right_corner, fill_gradient); + + return *this; + } EntityOverlay& EntityOverlay::add_cornered_2d_box(const Color& box_color, const Color& fill_color, const Color& outline_color, const float corner_ratio_len, const float thickness) @@ -38,11 +52,9 @@ namespace omath::hud }; // Left Side - draw_corner_line(m_canvas.top_left_corner, - m_canvas.top_left_corner + Vector2{corner_line_length, 0.f}); + draw_corner_line(m_canvas.top_left_corner, m_canvas.top_left_corner + Vector2{corner_line_length, 0.f}); - draw_corner_line(m_canvas.top_left_corner, - m_canvas.top_left_corner + Vector2{0.f, corner_line_length}); + draw_corner_line(m_canvas.top_left_corner, m_canvas.top_left_corner + Vector2{0.f, corner_line_length}); draw_corner_line(m_canvas.bottom_left_corner, m_canvas.bottom_left_corner - Vector2{0.f, corner_line_length}); @@ -98,28 +110,21 @@ namespace omath::hud return *this; } - EntityOverlay& EntityOverlay::add_right_label(const Color& color, const float offset, - const widget::Outlined outlined, - const std::string_view& text) + EntityOverlay& EntityOverlay::add_right_label(const widget::Paint& color, const float offset, + const widget::Outlined outlined, const std::string_view& text) { - if (outlined == widget::Outlined::On) - draw_outlined_text(m_text_cursor_right + Vector2{offset, 0.f}, color, text); - else - m_renderer->add_text(m_text_cursor_right + Vector2{offset, 0.f}, color, text.data()); + draw_label(m_text_cursor_right + Vector2{offset, 0.f}, color, outlined, text); m_text_cursor_right.y += m_renderer->calc_text_size(text.data()).y; return *this; } - EntityOverlay& EntityOverlay::add_top_label(const Color& color, const float offset, const widget::Outlined outlined, - const std::string_view text) + EntityOverlay& EntityOverlay::add_top_label(const widget::Paint& color, const float offset, + const widget::Outlined outlined, const std::string_view text) { m_text_cursor_top.y -= m_renderer->calc_text_size(text.data()).y; - if (outlined == widget::Outlined::On) - draw_outlined_text(m_text_cursor_top + Vector2{0.f, -offset}, color, text); - else - m_renderer->add_text(m_text_cursor_top + Vector2{0.f, -offset}, color, text.data()); + draw_label(m_text_cursor_top + Vector2{0.f, -offset}, color, outlined, text); return *this; } @@ -366,16 +371,31 @@ namespace omath::hud return *this; } - void EntityOverlay::draw_outlined_text(const Vector2& position, const Color& color, - const std::string_view& text) + void EntityOverlay::draw_label(const Vector2& position, const widget::Paint& paint, + const widget::Outlined outlined, const std::string_view& text) { - static constexpr std::array outline_offsets = { - Vector2{-1, -1}, Vector2{-1, 0}, Vector2{-1, 1}, Vector2{0, -1}, - Vector2{0, 1}, Vector2{1, -1}, Vector2{1, 0}, Vector2{1, 1}}; + if (outlined == widget::Outlined::On) + { + static constexpr std::array outline_offsets = { + Vector2{-1, -1}, Vector2{-1, 0}, Vector2{-1, 1}, Vector2{0, -1}, + Vector2{0, 1}, Vector2{1, -1}, Vector2{1, 0}, Vector2{1, 1}}; - for (const auto& outline_offset : outline_offsets) - m_renderer->add_text(position + outline_offset, Color{0.f, 0.f, 0.f, 1.f}, text.data()); - m_renderer->add_text(position, color, text.data()); + for (const auto& outline_offset : outline_offsets) + m_renderer->add_text(position + outline_offset, Color{0.f, 0.f, 0.f, 1.f}, text); + } + + std::visit( + widget::Overloaded{ + [&](const Color& color) + { + m_renderer->add_text(position, color, text); + }, + [&](const Gradient& gradient) + { + m_renderer->add_gradient_text(position, gradient, text); + }, + }, + paint); } EntityOverlay& EntityOverlay::add_bottom_bar(const Color& color, const Color& outline_color, const Color& bg_color, const float height, float ratio, const float offset) @@ -393,38 +413,33 @@ namespace omath::hud return *this; } - EntityOverlay& EntityOverlay::add_bottom_label(const Color& color, const float offset, const widget::Outlined outlined, - const std::string_view text) + EntityOverlay& EntityOverlay::add_bottom_label(const widget::Paint& color, const float offset, + const widget::Outlined outlined, const std::string_view text) { const auto text_size = m_renderer->calc_text_size(text); - if (outlined == widget::Outlined::On) - draw_outlined_text(m_text_cursor_bottom + Vector2{0.f, offset}, color, text); - else - m_renderer->add_text(m_text_cursor_bottom + Vector2{0.f, offset}, color, text); + draw_label(m_text_cursor_bottom + Vector2{0.f, offset}, color, outlined, text); m_text_cursor_bottom.y += text_size.y; return *this; } - EntityOverlay& EntityOverlay::add_left_label(const Color& color, const float offset, const widget::Outlined outlined, - const std::string_view& text) + EntityOverlay& EntityOverlay::add_left_label(const widget::Paint& color, const float offset, + const widget::Outlined outlined, const std::string_view& text) { const auto text_size = m_renderer->calc_text_size(text); const auto pos = m_text_cursor_left + Vector2{-(offset + text_size.x), 0.f}; - if (outlined == widget::Outlined::On) - draw_outlined_text(pos, color, text); - else - m_renderer->add_text(pos, color, text); + draw_label(pos, color, outlined, text); m_text_cursor_left.y += text_size.y; return *this; } - EntityOverlay& EntityOverlay::add_centered_bottom_label(const Color& color, const float offset, const widget::Outlined outlined, + EntityOverlay& EntityOverlay::add_centered_bottom_label(const widget::Paint& color, const float offset, + const widget::Outlined outlined, const std::string_view& text) { const auto text_size = m_renderer->calc_text_size(text); @@ -432,18 +447,15 @@ namespace omath::hud m_canvas.bottom_left_corner.x + (m_canvas.bottom_right_corner.x - m_canvas.bottom_left_corner.x) / 2.f; const auto pos = Vector2{box_center_x - text_size.x / 2.f, m_text_cursor_bottom.y + offset}; - if (outlined == widget::Outlined::On) - draw_outlined_text(pos, color, text); - else - m_renderer->add_text(pos, color, text); + draw_label(pos, color, outlined, text); m_text_cursor_bottom.y += text_size.y; return *this; } - EntityOverlay& EntityOverlay::add_centered_top_label(const Color& color, const float offset, const widget::Outlined outlined, - const std::string_view& text) + EntityOverlay& EntityOverlay::add_centered_top_label(const widget::Paint& color, const float offset, + const widget::Outlined outlined, const std::string_view& text) { const auto text_size = m_renderer->calc_text_size(text); const auto box_center_x = @@ -452,10 +464,7 @@ namespace omath::hud m_text_cursor_top.y -= text_size.y; const auto pos = Vector2{box_center_x - text_size.x / 2.f, m_text_cursor_top.y - offset}; - if (outlined == widget::Outlined::On) - draw_outlined_text(pos, color, text); - else - m_renderer->add_text(pos, color, text); + draw_label(pos, color, outlined, text); return *this; } @@ -601,7 +610,12 @@ namespace omath::hud // ── widget dispatch ─────────────────────────────────────────────────────── void EntityOverlay::dispatch(const widget::Box& box) { - add_2d_box(box.color, box.fill, box.outline, box.thickness); + std::visit( + [&](const auto& fill) + { + add_2d_box(box.color, fill, box.outline, box.thickness); + }, + box.fill); } void EntityOverlay::dispatch(const widget::CorneredBox& cornered_box) @@ -878,4 +892,4 @@ namespace omath::hud child); } -} // namespace omath::hud \ No newline at end of file +} // namespace omath::hud diff --git a/source/hud/renderer_realizations/imgui_renderer.cpp b/source/hud/renderer_realizations/imgui_renderer.cpp index 41943519..4e08dc98 100644 --- a/source/hud/renderer_realizations/imgui_renderer.cpp +++ b/source/hud/renderer_realizations/imgui_renderer.cpp @@ -28,7 +28,7 @@ namespace omath::hud void ImguiHudRenderer::add_filled_polyline(const std::span>& vertexes, const Color& color) { ImGui::GetBackgroundDrawList()->AddConvexPolyFilled(reinterpret_cast(vertexes.data()), - static_cast(vertexes.size()), color.to_im_color()); + static_cast(vertexes.size()), color.to_im_color()); } void ImguiHudRenderer::add_rectangle(const Vector2& min, const Vector2& max, const Color& color) @@ -42,30 +42,39 @@ namespace omath::hud ImGui::GetBackgroundDrawList()->AddRectFilled(min.to_im_vec2(), max.to_im_vec2(), color.to_im_color()); } + void ImguiHudRenderer::add_gradient_rectangle(const Vector2& min, const Vector2& max, + const Gradient& gradient) + { + ImGui::GetBackgroundDrawList()->AddRectFilledMultiColor( + min.to_im_vec2(), max.to_im_vec2(), gradient.top_left.to_im_color(), gradient.top_right.to_im_color(), + gradient.bottom_right.to_im_color(), gradient.bottom_left.to_im_color()); + } + void ImguiHudRenderer::add_circle(const Vector2& center, const float radius, const Color& color, - const float thickness, const int segments) + const float thickness, const int segments) { - ImGui::GetBackgroundDrawList()->AddCircle(center.to_im_vec2(), radius, color.to_im_color(), segments, thickness); + ImGui::GetBackgroundDrawList()->AddCircle(center.to_im_vec2(), radius, color.to_im_color(), segments, + thickness); } void ImguiHudRenderer::add_filled_circle(const Vector2& center, const float radius, const Color& color, - const int segments) + const int segments) { ImGui::GetBackgroundDrawList()->AddCircleFilled(center.to_im_vec2(), radius, color.to_im_color(), segments); } - void ImguiHudRenderer::add_arc(const Vector2& center, const float radius, const float a_min, const float a_max, - const Color& color, const float thickness, const int segments) + void ImguiHudRenderer::add_arc(const Vector2& center, const float radius, const float a_min, + const float a_max, const Color& color, const float thickness, const int segments) { ImGui::GetBackgroundDrawList()->PathArcTo(center.to_im_vec2(), radius, a_min, a_max, segments); ImGui::GetBackgroundDrawList()->PathStroke(color.to_im_color(), ImDrawFlags_None, thickness); } void ImguiHudRenderer::add_image(const std::any& texture_id, const Vector2& min, const Vector2& max, - const Color& tint) + const Color& tint) { ImGui::GetBackgroundDrawList()->AddImage(std::any_cast(texture_id), min.to_im_vec2(), - max.to_im_vec2(), {0, 0}, {1, 1}, tint.to_im_color()); + max.to_im_vec2(), {0, 0}, {1, 1}, tint.to_im_color()); } void ImguiHudRenderer::add_text(const Vector2& position, const Color& color, const std::string_view& text) @@ -73,6 +82,30 @@ namespace omath::hud ImGui::GetBackgroundDrawList()->AddText(position.to_im_vec2(), color.to_im_color(), text.data(), text.data() + text.size()); } + + void ImguiHudRenderer::add_gradient_text(const Vector2& position, const Gradient& gradient, + const std::string_view& text) + { + auto* draw_list = ImGui::GetBackgroundDrawList(); + const int vertex_start = draw_list->VtxBuffer.Size; + draw_list->AddText(position.to_im_vec2(), IM_COL32_WHITE, text.data(), text.data() + text.size()); + + const auto size = calc_text_size(text); + const float width = std::max(size.x, 1.f); + const float height = std::max(size.y, 1.f); + for (int i = vertex_start; i < draw_list->VtxBuffer.Size; ++i) + { + auto& vertex = draw_list->VtxBuffer[i]; + const float x = std::clamp((vertex.pos.x - position.x) / width, 0.f, 1.f); + const float y = std::clamp((vertex.pos.y - position.y) / height, 0.f, 1.f); + const auto top = gradient.top_left.value() * (1.f - x) + gradient.top_right.value() * x; + const auto bottom = gradient.bottom_left.value() * (1.f - x) + gradient.bottom_right.value() * x; + const auto color = top * (1.f - y) + bottom * y; + const auto alpha = static_cast(((vertex.col >> IM_COL32_A_SHIFT) & 0xff) * color.w); + vertex.col = IM_COL32(static_cast(color.x * 255.f), static_cast(color.y * 255.f), + static_cast(color.z * 255.f), alpha); + } + } [[nodiscard]] Vector2 ImguiHudRenderer::calc_text_size(const std::string_view& text) { From 1c89b12d32cc0d9ed742ac7044853dbda480eb18 Mon Sep 17 00:00:00 2001 From: Orange Date: Sat, 11 Jul 2026 18:17:59 +0300 Subject: [PATCH 2/9] improved stuff --- examples/example_hud/gui/main_window.cpp | 30 ++++++++---- examples/example_hud/gui/main_window.hpp | 1 + include/omath/hud/entity_overlay.hpp | 16 ++++--- include/omath/hud/entity_overlay_widgets.hpp | 2 +- include/omath/hud/gradient.hpp | 3 ++ source/hud/entity_overlay.cpp | 47 ++++++++++++++----- .../renderer_realizations/imgui_renderer.cpp | 30 ++++++++++++ 7 files changed, 100 insertions(+), 29 deletions(-) diff --git a/examples/example_hud/gui/main_window.cpp b/examples/example_hud/gui/main_window.cpp index ab34eee3..73f0e410 100644 --- a/examples/example_hud/gui/main_window.cpp +++ b/examples/example_hud/gui/main_window.cpp @@ -109,6 +109,7 @@ namespace imgui_desktop::gui ImGui::ColorEdit4("BG##bar", reinterpret_cast(&m_bar_bg_color), ImGuiColorEditFlags_NoInputs); ImGui::ColorEdit4("Outline##bar", reinterpret_cast(&m_bar_outline_color), ImGuiColorEditFlags_NoInputs); + ImGui::Checkbox("Gradient bars", &m_gradient_bars); ImGui::SliderFloat("Width##bar", &m_bar_width, 1.f, 20.f); ImGui::SliderFloat("Value##bar", &m_bar_value, 0.f, 1.f); ImGui::SliderFloat("Offset##bar", &m_bar_offset, 1.f, 20.f); @@ -211,7 +212,6 @@ namespace imgui_desktop::gui using namespace omath::hud::widget; using omath::hud::when; const auto* vp = ImGui::GetMainViewport(); - const Bar bar{m_bar_color, m_bar_outline_color, m_bar_bg_color, m_bar_width, m_bar_value, m_bar_offset}; const DashedBar dbar{m_bar_color, m_bar_outline_color, m_bar_bg_color, m_bar_width, m_bar_value, m_bar_dash_len, m_bar_dash_gap, m_bar_offset}; const auto animated_color = [&](const omath::Color& color, const float hue_offset) @@ -226,15 +226,27 @@ namespace imgui_desktop::gui }; const auto box_gradient_top = animated_color(m_box_gradient_top, 0.f); const auto box_gradient_bottom = animated_color(m_box_gradient_bottom, 0.5f); - const auto label_gradient_left = animated_color(m_label_gradient_left, 0.f); - const auto label_gradient_right = animated_color(m_label_gradient_right, 0.5f); + const auto red = omath::Color{1.f, 0.f, 0.f, 1.f}; + const auto green = omath::Color{0.f, 1.f, 0.f, 1.f}; + const auto bar_value_color = omath::Color{red.value() * (1.f - m_bar_value) + green.value() * m_bar_value}; + const Paint vertical_bar_color = + m_gradient_bars ? Paint{omath::hud::Gradient{bar_value_color, bar_value_color, red, red}} + : Paint{m_bar_color}; + const Paint horizontal_bar_color = + m_gradient_bars ? Paint{omath::hud::Gradient{red, bar_value_color, bar_value_color, red}} + : Paint{m_bar_color}; + const Bar vertical_bar{vertical_bar_color, m_bar_outline_color, m_bar_bg_color, + m_bar_width, m_bar_value, m_bar_offset}; + const Bar horizontal_bar{horizontal_bar_color, m_bar_outline_color, m_bar_bg_color, + m_bar_width, m_bar_value, m_bar_offset}; const Paint box_fill = m_gradient_box_fill ? Paint{omath::hud::Gradient{box_gradient_top, box_gradient_top, box_gradient_bottom, box_gradient_bottom}} : Paint{m_box_fill}; const Paint centered_label_color = - m_gradient_label ? Paint{omath::hud::Gradient{label_gradient_left, label_gradient_right, - label_gradient_right, label_gradient_left}} + m_gradient_label ? Paint{omath::hud::Gradient{m_label_gradient_left, m_label_gradient_right, + m_label_gradient_right, m_label_gradient_left, + m_animate_gradients}} : Paint{omath::Color::from_rgba(255, 255, 255, 255)}; auto outline_helper = [](const bool is_outline) -> Outlined @@ -250,7 +262,7 @@ namespace imgui_desktop::gui m_box_outline, m_corner_ratio, m_box_thickness}), when(m_show_dashed_box, DashedBox{m_dash_color, m_dash_len, m_dash_gap, m_dash_thickness}), RightSide{ - when(m_show_right_bar, bar), + when(m_show_right_bar, vertical_bar), when(m_show_right_dashed_bar, dbar), when(m_show_right_labels, Label{{0.f, 1.f, 0.f, 1.f}, m_label_offset, @@ -270,7 +282,7 @@ namespace imgui_desktop::gui m_ring_thickness, m_ring_offset}), }, LeftSide{ - when(m_show_left_bar, bar), + when(m_show_left_bar, vertical_bar), when(m_show_left_dashed_bar, dbar), when(m_show_left_labels, Label{omath::Color::from_rgba(255, 128, 0, 255), m_label_offset, @@ -280,7 +292,7 @@ namespace imgui_desktop::gui outline_helper(m_outlined), "Level: 42"}), }, TopSide{ - when(m_show_top_bar, bar), + when(m_show_top_bar, horizontal_bar), when(m_show_top_dashed_bar, dbar), when(m_show_centered_top, Centered{Label{omath::Color::from_rgba(0, 255, 255, 255), m_label_offset, @@ -291,7 +303,7 @@ namespace imgui_desktop::gui outline_helper(m_outlined), "*BLEEDING*"}), }, BottomSide{ - when(m_show_bottom_bar, bar), + when(m_show_bottom_bar, horizontal_bar), when(m_show_bottom_dashed_bar, dbar), when(m_show_centered_bottom, Centered{Label{centered_label_color, m_label_offset, outline_helper(m_outlined), diff --git a/examples/example_hud/gui/main_window.hpp b/examples/example_hud/gui/main_window.hpp index a2bb7a79..153adc6d 100644 --- a/examples/example_hud/gui/main_window.hpp +++ b/examples/example_hud/gui/main_window.hpp @@ -47,6 +47,7 @@ namespace imgui_desktop::gui omath::Color m_bar_bg_color{0.f, 0.f, 0.f, 0.5f}; omath::Color m_bar_outline_color{0.f, 0.f, 0.f, 1.f}; float m_bar_width = 4.f, m_bar_value = 0.75f, m_bar_offset = 5.f; + bool m_gradient_bars = true; bool m_show_right_bar = true, m_show_left_bar = true; bool m_show_top_bar = true, m_show_bottom_bar = true; bool m_show_right_dashed_bar = false, m_show_left_dashed_bar = false; diff --git a/include/omath/hud/entity_overlay.hpp b/include/omath/hud/entity_overlay.hpp index 723c8953..e2bf6086 100644 --- a/include/omath/hud/entity_overlay.hpp +++ b/include/omath/hud/entity_overlay.hpp @@ -41,16 +41,16 @@ namespace omath::hud float thickness = 1.f); // ── Bars ───────────────────────────────────────────────────────── - EntityOverlay& add_right_bar(const Color& color, const Color& outline_color, const Color& bg_color, float width, - float ratio, float offset = 5.f); + EntityOverlay& add_right_bar(const widget::Paint& color, const Color& outline_color, const Color& bg_color, + float width, float ratio, float offset = 5.f); - EntityOverlay& add_left_bar(const Color& color, const Color& outline_color, const Color& bg_color, float width, - float ratio, float offset = 5.f); + EntityOverlay& add_left_bar(const widget::Paint& color, const Color& outline_color, const Color& bg_color, + float width, float ratio, float offset = 5.f); - EntityOverlay& add_top_bar(const Color& color, const Color& outline_color, const Color& bg_color, float height, - float ratio, float offset = 5.f); + EntityOverlay& add_top_bar(const widget::Paint& color, const Color& outline_color, const Color& bg_color, + float height, float ratio, float offset = 5.f); - EntityOverlay& add_bottom_bar(const Color& color, const Color& outline_color, const Color& bg_color, + EntityOverlay& add_bottom_bar(const widget::Paint& color, const Color& outline_color, const Color& bg_color, float height, float ratio, float offset = 5.f); EntityOverlay& add_right_dashed_bar(const Color& color, const Color& outline_color, const Color& bg_color, @@ -254,6 +254,8 @@ namespace omath::hud void draw_progress_ring(const Vector2& center, const widget::ProgressRing& ring); void draw_label(const Vector2& position, const widget::Paint& paint, widget::Outlined outlined, const std::string_view& text); + void draw_filled_rectangle(const Vector2& min, const Vector2& max, + const widget::Paint& paint) const; void draw_dashed_line(const Vector2& from, const Vector2& to, const Color& color, float dash_len, float gap_len, float thickness) const; void draw_dashed_fill(const Vector2& origin, const Vector2& step_dir, diff --git a/include/omath/hud/entity_overlay_widgets.hpp b/include/omath/hud/entity_overlay_widgets.hpp index 3d2d4fd4..aefb2efd 100644 --- a/include/omath/hud/entity_overlay_widgets.hpp +++ b/include/omath/hud/entity_overlay_widgets.hpp @@ -108,7 +108,7 @@ namespace omath::hud::widget /// A filled bar. `size` is width for left/right sides, height for top/bottom. struct Bar { - Color color; + Paint color; Color outline; Color bg; float size; diff --git a/include/omath/hud/gradient.hpp b/include/omath/hud/gradient.hpp index 419dbc93..60665a33 100644 --- a/include/omath/hud/gradient.hpp +++ b/include/omath/hud/gradient.hpp @@ -9,5 +9,8 @@ namespace omath::hud Color top_right; Color bottom_right; Color bottom_left; + bool animated = false; + float animation_speed = 4.f; + float animation_spread = 0.7f; }; } // namespace omath::hud diff --git a/source/hud/entity_overlay.cpp b/source/hud/entity_overlay.cpp index 98d570a7..b33c5344 100644 --- a/source/hud/entity_overlay.cpp +++ b/source/hud/entity_overlay.cpp @@ -76,8 +76,9 @@ namespace omath::hud return *this; } - EntityOverlay& EntityOverlay::add_right_bar(const Color& color, const Color& outline_color, const Color& bg_color, - const float width, float ratio, const float offset) + EntityOverlay& EntityOverlay::add_right_bar(const widget::Paint& color, const Color& outline_color, + const Color& bg_color, const float width, float ratio, + const float offset) { ratio = std::clamp(ratio, 0.f, 1.f); const auto max_bar_height = std::abs(m_canvas.top_right_corner.y - m_canvas.bottom_right_corner.y); @@ -85,7 +86,7 @@ namespace omath::hud const auto bar_start = Vector2{m_text_cursor_right.x + offset, m_canvas.bottom_right_corner.y}; m_renderer->add_filled_rectangle(bar_start, bar_start + Vector2(width, -max_bar_height), bg_color); - m_renderer->add_filled_rectangle(bar_start, bar_start + Vector2(width, -max_bar_height * ratio), color); + draw_filled_rectangle(bar_start, bar_start + Vector2(width, -max_bar_height * ratio), color); m_renderer->add_rectangle(bar_start - Vector2(1.f, 0.f), bar_start + Vector2(width, -max_bar_height), outline_color); @@ -93,8 +94,9 @@ namespace omath::hud return *this; } - EntityOverlay& EntityOverlay::add_left_bar(const Color& color, const Color& outline_color, const Color& bg_color, - const float width, float ratio, const float offset) + EntityOverlay& EntityOverlay::add_left_bar(const widget::Paint& color, const Color& outline_color, + const Color& bg_color, const float width, float ratio, + const float offset) { ratio = std::clamp(ratio, 0.f, 1.f); const auto max_bar_height = std::abs(m_canvas.top_left_corner.y - m_canvas.bottom_right_corner.y); @@ -102,7 +104,7 @@ namespace omath::hud const auto bar_start = Vector2{m_text_cursor_left.x - (offset + width), m_canvas.bottom_left_corner.y}; m_renderer->add_filled_rectangle(bar_start, bar_start + Vector2(width, -max_bar_height), bg_color); - m_renderer->add_filled_rectangle(bar_start, bar_start + Vector2(width, -max_bar_height * ratio), color); + draw_filled_rectangle(bar_start, bar_start + Vector2(width, -max_bar_height * ratio), color); m_renderer->add_rectangle(bar_start - Vector2(1.f, 0.f), bar_start + Vector2(width, -max_bar_height), outline_color); @@ -128,8 +130,9 @@ namespace omath::hud return *this; } - EntityOverlay& EntityOverlay::add_top_bar(const Color& color, const Color& outline_color, const Color& bg_color, - const float height, float ratio, const float offset) + EntityOverlay& EntityOverlay::add_top_bar(const widget::Paint& color, const Color& outline_color, + const Color& bg_color, const float height, float ratio, + const float offset) { ratio = std::clamp(ratio, 0.f, 1.f); const auto max_bar_width = std::abs(m_canvas.top_left_corner.x - m_canvas.bottom_right_corner.x); @@ -137,7 +140,7 @@ namespace omath::hud const auto bar_start = Vector2{m_canvas.top_left_corner.x, m_text_cursor_top.y - offset}; m_renderer->add_filled_rectangle(bar_start, bar_start + Vector2(max_bar_width, -height), bg_color); - m_renderer->add_filled_rectangle(bar_start, bar_start + Vector2(max_bar_width * ratio, -height), color); + draw_filled_rectangle(bar_start, bar_start + Vector2(max_bar_width * ratio, -height), color); m_renderer->add_rectangle(bar_start, bar_start + Vector2(max_bar_width, -height), outline_color); m_text_cursor_top.y -= offset + height; @@ -397,15 +400,35 @@ namespace omath::hud }, paint); } - EntityOverlay& EntityOverlay::add_bottom_bar(const Color& color, const Color& outline_color, const Color& bg_color, - const float height, float ratio, const float offset) + + void EntityOverlay::draw_filled_rectangle(const Vector2& min, const Vector2& max, + const widget::Paint& paint) const + { + const Vector2 top_left{std::min(min.x, max.x), std::min(min.y, max.y)}; + const Vector2 bottom_right{std::max(min.x, max.x), std::max(min.y, max.y)}; + std::visit( + widget::Overloaded{ + [&](const Color& color) + { + m_renderer->add_filled_rectangle(top_left, bottom_right, color); + }, + [&](const Gradient& gradient) + { + m_renderer->add_gradient_rectangle(top_left, bottom_right, gradient); + }, + }, + paint); + } + EntityOverlay& EntityOverlay::add_bottom_bar(const widget::Paint& color, const Color& outline_color, + const Color& bg_color, const float height, float ratio, + const float offset) { ratio = std::clamp(ratio, 0.f, 1.f); const auto max_bar_width = std::abs(m_canvas.bottom_right_corner.x - m_canvas.bottom_left_corner.x); const auto bar_start = Vector2{m_canvas.bottom_left_corner.x, m_text_cursor_bottom.y + offset}; m_renderer->add_filled_rectangle(bar_start, bar_start + Vector2(max_bar_width, height), bg_color); - m_renderer->add_filled_rectangle(bar_start, bar_start + Vector2(max_bar_width * ratio, height), color); + draw_filled_rectangle(bar_start, bar_start + Vector2(max_bar_width * ratio, height), color); m_renderer->add_rectangle(bar_start, bar_start + Vector2(max_bar_width, height), outline_color); m_text_cursor_bottom.y += offset + height; diff --git a/source/hud/renderer_realizations/imgui_renderer.cpp b/source/hud/renderer_realizations/imgui_renderer.cpp index 4e08dc98..65e15b3b 100644 --- a/source/hud/renderer_realizations/imgui_renderer.cpp +++ b/source/hud/renderer_realizations/imgui_renderer.cpp @@ -4,7 +4,9 @@ #include "omath/hud/renderer_realizations/imgui_renderer.hpp" #ifdef OMATH_IMGUI_INTEGRATION +#include #include +#include namespace omath::hud { @@ -87,6 +89,34 @@ namespace omath::hud const std::string_view& text) { auto* draw_list = ImGui::GetBackgroundDrawList(); + if (gradient.animated) + { + const float animation_offset = static_cast(ImGui::GetTime()) * gradient.animation_speed; + float cursor_x = position.x; + const char* glyph_start = text.data(); + const char* const text_end = text.data() + text.size(); + int glyph_index = 0; + while (glyph_start < text_end) + { + unsigned int codepoint; + const int glyph_size = ImTextCharFromUtf8(&codepoint, glyph_start, text_end); + if (glyph_size <= 0) + break; + static_cast(codepoint); + + const char* const glyph_end = glyph_start + glyph_size; + const float blend = + (std::sin(animation_offset + static_cast(glyph_index) * gradient.animation_spread) + 1.f) + * 0.5f; + const auto color = gradient.top_left.value() * (1.f - blend) + gradient.top_right.value() * blend; + draw_list->AddText({cursor_x, position.y}, Color{color}.to_im_color(), glyph_start, glyph_end); + cursor_x += ImGui::CalcTextSize(glyph_start, glyph_end).x; + glyph_start = glyph_end; + ++glyph_index; + } + return; + } + const int vertex_start = draw_list->VtxBuffer.Size; draw_list->AddText(position.to_im_vec2(), IM_COL32_WHITE, text.data(), text.data() + text.size()); From 26823609e746609bf41684315597a1ec45a3d3f1 Mon Sep 17 00:00:00 2001 From: Orange Date: Sat, 11 Jul 2026 18:50:59 +0300 Subject: [PATCH 3/9] added glow --- examples/example_hud/gui/main_window.cpp | 44 ++++- examples/example_hud/gui/main_window.hpp | 13 ++ include/omath/hud/entity_overlay.hpp | 36 ++-- include/omath/hud/entity_overlay_widgets.hpp | 11 ++ source/hud/entity_overlay.cpp | 165 +++++++++++++++---- 5 files changed, 220 insertions(+), 49 deletions(-) diff --git a/examples/example_hud/gui/main_window.cpp b/examples/example_hud/gui/main_window.cpp index 73f0e410..e0449469 100644 --- a/examples/example_hud/gui/main_window.cpp +++ b/examples/example_hud/gui/main_window.cpp @@ -66,6 +66,19 @@ namespace imgui_desktop::gui ImGui::Begin("Controls", &m_opened, ImGuiWindowFlags_NoMove | ImGuiWindowFlags_NoResize | ImGuiWindowFlags_NoCollapse); ImGui::PushItemWidth(160.f); + const auto draw_glow_controls = [](const char* label, GlowSettings& settings) + { + ImGui::PushID(label); + ImGui::TextUnformatted(label); + ImGui::Checkbox("Glow", &settings.enabled); + if (settings.enabled) + { + ImGui::ColorEdit4("Color", reinterpret_cast(&settings.color), ImGuiColorEditFlags_NoInputs); + ImGui::SliderFloat("Radius", &settings.radius, 1.f, 12.f); + ImGui::SliderFloat("Intensity", &settings.intensity, 0.f, 1.f); + } + ImGui::PopID(); + }; if (ImGui::CollapsingHeader("Entity", ImGuiTreeNodeFlags_DefaultOpen)) { @@ -96,6 +109,8 @@ namespace imgui_desktop::gui ImGui::ColorEdit4("Outline##box", reinterpret_cast(&m_box_outline), ImGuiColorEditFlags_NoInputs); ImGui::SliderFloat("Thickness", &m_box_thickness, 0.5f, 5.f); ImGui::SliderFloat("Corner ratio", &m_corner_ratio, 0.05f, 0.5f); + draw_glow_controls("Box glow", m_box_glow); + draw_glow_controls("Cornered box glow", m_cornered_box_glow); ImGui::Separator(); ImGui::ColorEdit4("Dash color", reinterpret_cast(&m_dash_color), ImGuiColorEditFlags_NoInputs); ImGui::SliderFloat("Dash length", &m_dash_len, 2.f, 30.f); @@ -127,6 +142,7 @@ namespace imgui_desktop::gui ImGui::Checkbox("Bot dashed##bar", &m_show_bottom_dashed_bar); ImGui::SliderFloat("Dash len##bar", &m_bar_dash_len, 2.f, 20.f); ImGui::SliderFloat("Dash gap##bar", &m_bar_dash_gap, 1.f, 15.f); + draw_glow_controls("Bar glow", m_bar_glow); } if (ImGui::CollapsingHeader("Labels", ImGuiTreeNodeFlags_DefaultOpen)) @@ -150,6 +166,7 @@ namespace imgui_desktop::gui ImGui::Checkbox("Ctr top##lbl", &m_show_centered_top); ImGui::SameLine(); ImGui::Checkbox("Ctr bot##lbl", &m_show_centered_bottom); + draw_glow_controls("Label glow", m_label_glow); } if (ImGui::CollapsingHeader("Skeleton")) @@ -229,16 +246,26 @@ namespace imgui_desktop::gui const auto red = omath::Color{1.f, 0.f, 0.f, 1.f}; const auto green = omath::Color{0.f, 1.f, 0.f, 1.f}; const auto bar_value_color = omath::Color{red.value() * (1.f - m_bar_value) + green.value() * m_bar_value}; + const auto make_glow = [](const GlowSettings& settings) -> std::optional + { + if (!settings.enabled) + return std::nullopt; + return Glow{settings.color, settings.radius, settings.intensity}; + }; + const auto box_glow = make_glow(m_box_glow); + const auto cornered_box_glow = make_glow(m_cornered_box_glow); + const auto bar_glow = make_glow(m_bar_glow); + const auto label_glow = make_glow(m_label_glow); const Paint vertical_bar_color = m_gradient_bars ? Paint{omath::hud::Gradient{bar_value_color, bar_value_color, red, red}} : Paint{m_bar_color}; const Paint horizontal_bar_color = m_gradient_bars ? Paint{omath::hud::Gradient{red, bar_value_color, bar_value_color, red}} : Paint{m_bar_color}; - const Bar vertical_bar{vertical_bar_color, m_bar_outline_color, m_bar_bg_color, - m_bar_width, m_bar_value, m_bar_offset}; - const Bar horizontal_bar{horizontal_bar_color, m_bar_outline_color, m_bar_bg_color, - m_bar_width, m_bar_value, m_bar_offset}; + const Bar vertical_bar{vertical_bar_color, m_bar_outline_color, m_bar_bg_color, m_bar_width, + m_bar_value, m_bar_offset, bar_glow}; + const Bar horizontal_bar{horizontal_bar_color, m_bar_outline_color, m_bar_bg_color, m_bar_width, + m_bar_value, m_bar_offset, bar_glow}; const Paint box_fill = m_gradient_box_fill ? Paint{omath::hud::Gradient{box_gradient_top, box_gradient_top, box_gradient_bottom, box_gradient_bottom}} @@ -257,9 +284,10 @@ namespace imgui_desktop::gui std::make_shared()) .contents( // ── Boxes ──────────────────────────────────────────────────── - when(m_show_box, Box{m_box_color, box_fill, m_box_outline, m_box_thickness}), - when(m_show_cornered_box, CorneredBox{omath::Color::from_rgba(255, 0, 255, 255), m_box_fill, - m_box_outline, m_corner_ratio, m_box_thickness}), + when(m_show_box, Box{m_box_color, box_fill, m_box_outline, m_box_thickness, box_glow}), + when(m_show_cornered_box, + CorneredBox{omath::Color::from_rgba(255, 0, 255, 255), m_box_fill, m_box_outline, + m_corner_ratio, m_box_thickness, cornered_box_glow}), when(m_show_dashed_box, DashedBox{m_dash_color, m_dash_len, m_dash_gap, m_dash_thickness}), RightSide{ when(m_show_right_bar, vertical_bar), @@ -307,7 +335,7 @@ namespace imgui_desktop::gui when(m_show_bottom_dashed_bar, dbar), when(m_show_centered_bottom, Centered{Label{centered_label_color, m_label_offset, outline_helper(m_outlined), - "Gradient PlayerName"}}), + "Gradient PlayerName", label_glow}}), when(m_show_bottom_labels, Label{omath::Color::from_rgba(200, 200, 0, 255), m_label_offset, outline_helper(m_outlined), "42m"}), }, diff --git a/examples/example_hud/gui/main_window.hpp b/examples/example_hud/gui/main_window.hpp index 153adc6d..26e3ef27 100644 --- a/examples/example_hud/gui/main_window.hpp +++ b/examples/example_hud/gui/main_window.hpp @@ -17,6 +17,14 @@ namespace imgui_desktop::gui void Run(); private: + struct GlowSettings + { + omath::Color color{0.f, 0.7f, 1.f, 0.8f}; + float radius = 4.f; + float intensity = 0.8f; + bool enabled = false; + }; + void draw_controls(); void draw_overlay(); void present(); @@ -64,6 +72,11 @@ namespace imgui_desktop::gui bool m_show_top_labels = true, m_show_bottom_labels = true; bool m_show_centered_top = true, m_show_centered_bottom = true; + GlowSettings m_box_glow; + GlowSettings m_cornered_box_glow{{1.f, 0.f, 1.f, 0.8f}}; + GlowSettings m_bar_glow{{1.f, 0.f, 0.f, 0.8f}}; + GlowSettings m_label_glow; + // Skeleton omath::Color m_skel_color = omath::Color::from_rgba(255, 255, 255, 200); float m_skel_thickness = 1.f; diff --git a/include/omath/hud/entity_overlay.hpp b/include/omath/hud/entity_overlay.hpp index e2bf6086..f8b3712c 100644 --- a/include/omath/hud/entity_overlay.hpp +++ b/include/omath/hud/entity_overlay.hpp @@ -42,16 +42,20 @@ namespace omath::hud // ── Bars ───────────────────────────────────────────────────────── EntityOverlay& add_right_bar(const widget::Paint& color, const Color& outline_color, const Color& bg_color, - float width, float ratio, float offset = 5.f); + float width, float ratio, float offset = 5.f, + const std::optional& glow = std::nullopt); EntityOverlay& add_left_bar(const widget::Paint& color, const Color& outline_color, const Color& bg_color, - float width, float ratio, float offset = 5.f); + float width, float ratio, float offset = 5.f, + const std::optional& glow = std::nullopt); EntityOverlay& add_top_bar(const widget::Paint& color, const Color& outline_color, const Color& bg_color, - float height, float ratio, float offset = 5.f); + float height, float ratio, float offset = 5.f, + const std::optional& glow = std::nullopt); EntityOverlay& add_bottom_bar(const widget::Paint& color, const Color& outline_color, const Color& bg_color, - float height, float ratio, float offset = 5.f); + float height, float ratio, float offset = 5.f, + const std::optional& glow = std::nullopt); EntityOverlay& add_right_dashed_bar(const Color& color, const Color& outline_color, const Color& bg_color, float width, float ratio, float dash_len, float gap_len, @@ -69,22 +73,26 @@ namespace omath::hud // ── Labels ─────────────────────────────────────────────────────── EntityOverlay& add_right_label(const widget::Paint& color, float offset, widget::Outlined outlined, - const std::string_view& text); + const std::string_view& text, + const std::optional& glow = std::nullopt); EntityOverlay& add_left_label(const widget::Paint& color, float offset, widget::Outlined outlined, - const std::string_view& text); + const std::string_view& text, + const std::optional& glow = std::nullopt); EntityOverlay& add_top_label(const widget::Paint& color, float offset, widget::Outlined outlined, - std::string_view text); + std::string_view text, const std::optional& glow = std::nullopt); EntityOverlay& add_bottom_label(const widget::Paint& color, float offset, widget::Outlined outlined, - std::string_view text); + std::string_view text, const std::optional& glow = std::nullopt); EntityOverlay& add_centered_top_label(const widget::Paint& color, float offset, widget::Outlined outlined, - const std::string_view& text); + const std::string_view& text, + const std::optional& glow = std::nullopt); EntityOverlay& add_centered_bottom_label(const widget::Paint& color, float offset, widget::Outlined outlined, - const std::string_view& text); + const std::string_view& text, + const std::optional& glow = std::nullopt); template requires(sizeof...(Args) > 0) @@ -253,7 +261,13 @@ namespace omath::hud void dispatch(const widget::ProjectileAim& proj_widget); void draw_progress_ring(const Vector2& center, const widget::ProgressRing& ring); void draw_label(const Vector2& position, const widget::Paint& paint, widget::Outlined outlined, - const std::string_view& text); + const std::string_view& text, const std::optional& glow); + void draw_glow_polyline(const std::span>& points, const widget::Glow& glow, + float thickness) const; + void draw_glow_line(const Vector2& from, const Vector2& to, const widget::Glow& glow, + float thickness) const; + void draw_glow_rectangle(const Vector2& min, const Vector2& max, + const std::optional& glow) const; void draw_filled_rectangle(const Vector2& min, const Vector2& max, const widget::Paint& paint) const; void draw_dashed_line(const Vector2& from, const Vector2& to, const Color& color, float dash_len, diff --git a/include/omath/hud/entity_overlay_widgets.hpp b/include/omath/hud/entity_overlay_widgets.hpp index aefb2efd..5c4d1b95 100644 --- a/include/omath/hud/entity_overlay_widgets.hpp +++ b/include/omath/hud/entity_overlay_widgets.hpp @@ -32,6 +32,13 @@ namespace omath::hud::widget template Overloaded(Ts...) -> Overloaded; + struct Glow + { + Color color; + float radius = 4.f; + float intensity = 1.f; + }; + // ── Standalone widgets ──────────────────────────────────────────────────── struct Box { @@ -39,6 +46,7 @@ namespace omath::hud::widget Paint fill{Color{0.f, 0.f, 0.f, 0.f}}; Color outline{0.f, 0.f, 0.f, 0.f}; float thickness = 1.f; + std::optional glow = std::nullopt; }; enum class Outlined @@ -53,6 +61,7 @@ namespace omath::hud::widget Color outline{0.f, 0.f, 0.f, 0.f}; float corner_ratio = 0.2f; float thickness = 1.f; + std::optional glow = std::nullopt; }; struct DashedBox @@ -114,6 +123,7 @@ namespace omath::hud::widget float size; float ratio; float offset = 5.f; + std::optional glow = std::nullopt; }; /// A dashed bar. Same field semantics as Bar plus dash parameters. @@ -135,6 +145,7 @@ namespace omath::hud::widget float offset; Outlined outlined; std::string_view text; + std::optional glow = std::nullopt; }; /// Wraps a Label to request horizontal centering (only applied in TopSide / BottomSide). diff --git a/source/hud/entity_overlay.cpp b/source/hud/entity_overlay.cpp index b33c5344..ef22d623 100644 --- a/source/hud/entity_overlay.cpp +++ b/source/hud/entity_overlay.cpp @@ -78,7 +78,7 @@ namespace omath::hud } EntityOverlay& EntityOverlay::add_right_bar(const widget::Paint& color, const Color& outline_color, const Color& bg_color, const float width, float ratio, - const float offset) + const float offset, const std::optional& glow) { ratio = std::clamp(ratio, 0.f, 1.f); const auto max_bar_height = std::abs(m_canvas.top_right_corner.y - m_canvas.bottom_right_corner.y); @@ -86,6 +86,7 @@ namespace omath::hud const auto bar_start = Vector2{m_text_cursor_right.x + offset, m_canvas.bottom_right_corner.y}; m_renderer->add_filled_rectangle(bar_start, bar_start + Vector2(width, -max_bar_height), bg_color); + draw_glow_rectangle(bar_start, bar_start + Vector2(width, -max_bar_height * ratio), glow); draw_filled_rectangle(bar_start, bar_start + Vector2(width, -max_bar_height * ratio), color); m_renderer->add_rectangle(bar_start - Vector2(1.f, 0.f), bar_start + Vector2(width, -max_bar_height), outline_color); @@ -96,7 +97,7 @@ namespace omath::hud } EntityOverlay& EntityOverlay::add_left_bar(const widget::Paint& color, const Color& outline_color, const Color& bg_color, const float width, float ratio, - const float offset) + const float offset, const std::optional& glow) { ratio = std::clamp(ratio, 0.f, 1.f); const auto max_bar_height = std::abs(m_canvas.top_left_corner.y - m_canvas.bottom_right_corner.y); @@ -104,6 +105,7 @@ namespace omath::hud const auto bar_start = Vector2{m_text_cursor_left.x - (offset + width), m_canvas.bottom_left_corner.y}; m_renderer->add_filled_rectangle(bar_start, bar_start + Vector2(width, -max_bar_height), bg_color); + draw_glow_rectangle(bar_start, bar_start + Vector2(width, -max_bar_height * ratio), glow); draw_filled_rectangle(bar_start, bar_start + Vector2(width, -max_bar_height * ratio), color); m_renderer->add_rectangle(bar_start - Vector2(1.f, 0.f), bar_start + Vector2(width, -max_bar_height), outline_color); @@ -113,26 +115,28 @@ namespace omath::hud return *this; } EntityOverlay& EntityOverlay::add_right_label(const widget::Paint& color, const float offset, - const widget::Outlined outlined, const std::string_view& text) + const widget::Outlined outlined, const std::string_view& text, + const std::optional& glow) { - draw_label(m_text_cursor_right + Vector2{offset, 0.f}, color, outlined, text); + draw_label(m_text_cursor_right + Vector2{offset, 0.f}, color, outlined, text, glow); m_text_cursor_right.y += m_renderer->calc_text_size(text.data()).y; return *this; } EntityOverlay& EntityOverlay::add_top_label(const widget::Paint& color, const float offset, - const widget::Outlined outlined, const std::string_view text) + const widget::Outlined outlined, const std::string_view text, + const std::optional& glow) { m_text_cursor_top.y -= m_renderer->calc_text_size(text.data()).y; - draw_label(m_text_cursor_top + Vector2{0.f, -offset}, color, outlined, text); + draw_label(m_text_cursor_top + Vector2{0.f, -offset}, color, outlined, text, glow); return *this; } EntityOverlay& EntityOverlay::add_top_bar(const widget::Paint& color, const Color& outline_color, const Color& bg_color, const float height, float ratio, - const float offset) + const float offset, const std::optional& glow) { ratio = std::clamp(ratio, 0.f, 1.f); const auto max_bar_width = std::abs(m_canvas.top_left_corner.x - m_canvas.bottom_right_corner.x); @@ -140,6 +144,7 @@ namespace omath::hud const auto bar_start = Vector2{m_canvas.top_left_corner.x, m_text_cursor_top.y - offset}; m_renderer->add_filled_rectangle(bar_start, bar_start + Vector2(max_bar_width, -height), bg_color); + draw_glow_rectangle(bar_start, bar_start + Vector2(max_bar_width * ratio, -height), glow); draw_filled_rectangle(bar_start, bar_start + Vector2(max_bar_width * ratio, -height), color); m_renderer->add_rectangle(bar_start, bar_start + Vector2(max_bar_width, -height), outline_color); @@ -375,8 +380,35 @@ namespace omath::hud } void EntityOverlay::draw_label(const Vector2& position, const widget::Paint& paint, - const widget::Outlined outlined, const std::string_view& text) + const widget::Outlined outlined, const std::string_view& text, + const std::optional& glow) { + if (glow) + { + const int radius = static_cast(std::ceil(std::max(glow->radius, 0.f))); + for (int layer = radius; layer > 0; --layer) + { + const float alpha = glow->color.value().w * std::clamp(glow->intensity, 0.f, 1.f) + * (1.f - static_cast(layer - 1) / static_cast(radius + 1)); + const auto value = glow->color.value(); + const Color color{value.x, value.y, value.z, alpha / static_cast(radius)}; + for (int x = -layer; x <= layer; ++x) + { + m_renderer->add_text(position + Vector2{static_cast(x), static_cast(-layer)}, + color, text); + m_renderer->add_text(position + Vector2{static_cast(x), static_cast(layer)}, + color, text); + } + for (int y = -layer + 1; y < layer; ++y) + { + m_renderer->add_text(position + Vector2{static_cast(-layer), static_cast(y)}, + color, text); + m_renderer->add_text(position + Vector2{static_cast(layer), static_cast(y)}, + color, text); + } + } + } + if (outlined == widget::Outlined::On) { static constexpr std::array outline_offsets = { @@ -401,6 +433,49 @@ namespace omath::hud paint); } + void EntityOverlay::draw_glow_polyline(const std::span>& points, const widget::Glow& glow, + const float thickness) const + { + const int radius = static_cast(std::ceil(std::max(glow.radius, 0.f))); + const auto value = glow.color.value(); + for (int layer = radius; layer > 0; --layer) + { + const float falloff = 1.f - static_cast(layer - 1) / static_cast(radius + 1); + const Color color{value.x, value.y, value.z, + value.w * std::clamp(glow.intensity, 0.f, 1.f) * falloff / static_cast(radius)}; + m_renderer->add_polyline(points, color, thickness + static_cast(layer) * 2.f); + } + } + + void EntityOverlay::draw_glow_line(const Vector2& from, const Vector2& to, const widget::Glow& glow, + const float thickness) const + { + const int radius = static_cast(std::ceil(std::max(glow.radius, 0.f))); + const auto value = glow.color.value(); + for (int layer = radius; layer > 0; --layer) + { + const float falloff = 1.f - static_cast(layer - 1) / static_cast(radius + 1); + const Color color{value.x, value.y, value.z, + value.w * std::clamp(glow.intensity, 0.f, 1.f) * falloff / static_cast(radius)}; + m_renderer->add_line(from, to, color, thickness + static_cast(layer) * 2.f); + } + } + + void EntityOverlay::draw_glow_rectangle(const Vector2& min, const Vector2& max, + const std::optional& glow) const + { + if (!glow || glow->radius <= 0.f) + return; + + const std::array points = { + Vector2{std::min(min.x, max.x), std::min(min.y, max.y)}, + Vector2{std::max(min.x, max.x), std::min(min.y, max.y)}, + Vector2{std::max(min.x, max.x), std::max(min.y, max.y)}, + Vector2{std::min(min.x, max.x), std::max(min.y, max.y)}, + }; + draw_glow_polyline(points, *glow, 1.f); + } + void EntityOverlay::draw_filled_rectangle(const Vector2& min, const Vector2& max, const widget::Paint& paint) const { @@ -421,13 +496,14 @@ namespace omath::hud } EntityOverlay& EntityOverlay::add_bottom_bar(const widget::Paint& color, const Color& outline_color, const Color& bg_color, const float height, float ratio, - const float offset) + const float offset, const std::optional& glow) { ratio = std::clamp(ratio, 0.f, 1.f); const auto max_bar_width = std::abs(m_canvas.bottom_right_corner.x - m_canvas.bottom_left_corner.x); const auto bar_start = Vector2{m_canvas.bottom_left_corner.x, m_text_cursor_bottom.y + offset}; m_renderer->add_filled_rectangle(bar_start, bar_start + Vector2(max_bar_width, height), bg_color); + draw_glow_rectangle(bar_start, bar_start + Vector2(max_bar_width * ratio, height), glow); draw_filled_rectangle(bar_start, bar_start + Vector2(max_bar_width * ratio, height), color); m_renderer->add_rectangle(bar_start, bar_start + Vector2(max_bar_width, height), outline_color); @@ -437,11 +513,12 @@ namespace omath::hud } EntityOverlay& EntityOverlay::add_bottom_label(const widget::Paint& color, const float offset, - const widget::Outlined outlined, const std::string_view text) + const widget::Outlined outlined, const std::string_view text, + const std::optional& glow) { const auto text_size = m_renderer->calc_text_size(text); - draw_label(m_text_cursor_bottom + Vector2{0.f, offset}, color, outlined, text); + draw_label(m_text_cursor_bottom + Vector2{0.f, offset}, color, outlined, text, glow); m_text_cursor_bottom.y += text_size.y; @@ -449,12 +526,13 @@ namespace omath::hud } EntityOverlay& EntityOverlay::add_left_label(const widget::Paint& color, const float offset, - const widget::Outlined outlined, const std::string_view& text) + const widget::Outlined outlined, const std::string_view& text, + const std::optional& glow) { const auto text_size = m_renderer->calc_text_size(text); const auto pos = m_text_cursor_left + Vector2{-(offset + text_size.x), 0.f}; - draw_label(pos, color, outlined, text); + draw_label(pos, color, outlined, text, glow); m_text_cursor_left.y += text_size.y; @@ -463,14 +541,15 @@ namespace omath::hud EntityOverlay& EntityOverlay::add_centered_bottom_label(const widget::Paint& color, const float offset, const widget::Outlined outlined, - const std::string_view& text) + const std::string_view& text, + const std::optional& glow) { const auto text_size = m_renderer->calc_text_size(text); const auto box_center_x = m_canvas.bottom_left_corner.x + (m_canvas.bottom_right_corner.x - m_canvas.bottom_left_corner.x) / 2.f; const auto pos = Vector2{box_center_x - text_size.x / 2.f, m_text_cursor_bottom.y + offset}; - draw_label(pos, color, outlined, text); + draw_label(pos, color, outlined, text, glow); m_text_cursor_bottom.y += text_size.y; @@ -478,7 +557,8 @@ namespace omath::hud } EntityOverlay& EntityOverlay::add_centered_top_label(const widget::Paint& color, const float offset, - const widget::Outlined outlined, const std::string_view& text) + const widget::Outlined outlined, const std::string_view& text, + const std::optional& glow) { const auto text_size = m_renderer->calc_text_size(text); const auto box_center_x = @@ -487,7 +567,7 @@ namespace omath::hud m_text_cursor_top.y -= text_size.y; const auto pos = Vector2{box_center_x - text_size.x / 2.f, m_text_cursor_top.y - offset}; - draw_label(pos, color, outlined, text); + draw_label(pos, color, outlined, text, glow); return *this; } @@ -633,6 +713,11 @@ namespace omath::hud // ── widget dispatch ─────────────────────────────────────────────────────── void EntityOverlay::dispatch(const widget::Box& box) { + if (box.glow) + { + const auto points = m_canvas.as_array(); + draw_glow_polyline(points, *box.glow, box.thickness); + } std::visit( [&](const auto& fill) { @@ -643,6 +728,23 @@ namespace omath::hud void EntityOverlay::dispatch(const widget::CorneredBox& cornered_box) { + if (cornered_box.glow) + { + const float length = + std::abs(m_canvas.top_left_corner.x - m_canvas.top_right_corner.x) * cornered_box.corner_ratio; + const std::array lines = { + std::pair{m_canvas.top_left_corner, m_canvas.top_left_corner + Vector2{length, 0.f}}, + std::pair{m_canvas.top_left_corner, m_canvas.top_left_corner + Vector2{0.f, length}}, + std::pair{m_canvas.bottom_left_corner, m_canvas.bottom_left_corner - Vector2{0.f, length}}, + std::pair{m_canvas.bottom_left_corner, m_canvas.bottom_left_corner + Vector2{length, 0.f}}, + std::pair{m_canvas.top_right_corner, m_canvas.top_right_corner - Vector2{length, 0.f}}, + std::pair{m_canvas.top_right_corner, m_canvas.top_right_corner + Vector2{0.f, length}}, + std::pair{m_canvas.bottom_right_corner, m_canvas.bottom_right_corner - Vector2{0.f, length}}, + std::pair{m_canvas.bottom_right_corner, m_canvas.bottom_right_corner - Vector2{length, 0.f}}, + }; + for (const auto& [from, to] : lines) + draw_glow_line(from, to, *cornered_box.glow, cornered_box.thickness); + } add_cornered_2d_box(cornered_box.color, cornered_box.fill, cornered_box.outline, cornered_box.corner_ratio, cornered_box.thickness); } @@ -741,7 +843,7 @@ namespace omath::hud }, [this](const widget::Bar& w) { - add_right_bar(w.color, w.outline, w.bg, w.size, w.ratio, w.offset); + add_right_bar(w.color, w.outline, w.bg, w.size, w.ratio, w.offset, w.glow); }, [this](const widget::DashedBar& w) { @@ -750,11 +852,12 @@ namespace omath::hud }, [this](const widget::Label& w) { - add_right_label(w.color, w.offset, w.outlined, w.text); + add_right_label(w.color, w.offset, w.outlined, w.text, w.glow); }, [this](const widget::Centered& w) { - add_right_label(w.child.color, w.child.offset, w.child.outlined, w.child.text); + add_right_label(w.child.color, w.child.offset, w.child.outlined, w.child.text, + w.child.glow); }, [this](const widget::SpaceVertical& w) { @@ -787,7 +890,7 @@ namespace omath::hud }, [this](const widget::Bar& w) { - add_left_bar(w.color, w.outline, w.bg, w.size, w.ratio, w.offset); + add_left_bar(w.color, w.outline, w.bg, w.size, w.ratio, w.offset, w.glow); }, [this](const widget::DashedBar& w) { @@ -796,11 +899,12 @@ namespace omath::hud }, [this](const widget::Label& w) { - add_left_label(w.color, w.offset, w.outlined, w.text); + add_left_label(w.color, w.offset, w.outlined, w.text, w.glow); }, [this](const widget::Centered& w) { - add_left_label(w.child.color, w.child.offset, w.child.outlined, w.child.text); + add_left_label(w.child.color, w.child.offset, w.child.outlined, w.child.text, + w.child.glow); }, [this](const widget::SpaceVertical& w) { @@ -833,7 +937,7 @@ namespace omath::hud }, [this](const widget::Bar& w) { - add_top_bar(w.color, w.outline, w.bg, w.size, w.ratio, w.offset); + add_top_bar(w.color, w.outline, w.bg, w.size, w.ratio, w.offset, w.glow); }, [this](const widget::DashedBar& w) { @@ -842,11 +946,12 @@ namespace omath::hud }, [this](const widget::Label& w) { - add_top_label(w.color, w.offset, w.outlined, w.text); + add_top_label(w.color, w.offset, w.outlined, w.text, w.glow); }, [this](const widget::Centered& w) { - add_centered_top_label(w.child.color, w.child.offset, w.child.outlined, w.child.text); + add_centered_top_label(w.child.color, w.child.offset, w.child.outlined, w.child.text, + w.child.glow); }, [this](const widget::SpaceVertical& w) { @@ -878,7 +983,7 @@ namespace omath::hud }, [this](const widget::Bar& w) { - add_bottom_bar(w.color, w.outline, w.bg, w.size, w.ratio, w.offset); + add_bottom_bar(w.color, w.outline, w.bg, w.size, w.ratio, w.offset, w.glow); }, [this](const widget::DashedBar& w) { @@ -887,12 +992,12 @@ namespace omath::hud }, [this](const widget::Label& w) { - add_bottom_label(w.color, w.offset, w.outlined, w.text); + add_bottom_label(w.color, w.offset, w.outlined, w.text, w.glow); }, [this](const widget::Centered& w) { - add_centered_bottom_label(w.child.color, w.child.offset, w.child.outlined, - w.child.text); + add_centered_bottom_label(w.child.color, w.child.offset, w.child.outlined, w.child.text, + w.child.glow); }, [this](const widget::SpaceVertical& w) { From 1618a413189ae8badb7441315f87644ff64df4a0 Mon Sep 17 00:00:00 2001 From: Orange Date: Sat, 11 Jul 2026 22:20:26 +0300 Subject: [PATCH 4/9] added blur --- examples/example_hud/gui/main_window.cpp | 7 +++- examples/example_hud/gui/main_window.hpp | 1 + include/omath/hud/entity_overlay.hpp | 2 + include/omath/hud/entity_overlay_widgets.hpp | 5 +++ source/hud/entity_overlay.cpp | 42 ++++++++++++++++++++ 5 files changed, 55 insertions(+), 2 deletions(-) diff --git a/examples/example_hud/gui/main_window.cpp b/examples/example_hud/gui/main_window.cpp index e0449469..cb3cd5b2 100644 --- a/examples/example_hud/gui/main_window.cpp +++ b/examples/example_hud/gui/main_window.cpp @@ -66,7 +66,7 @@ namespace imgui_desktop::gui ImGui::Begin("Controls", &m_opened, ImGuiWindowFlags_NoMove | ImGuiWindowFlags_NoResize | ImGuiWindowFlags_NoCollapse); ImGui::PushItemWidth(160.f); - const auto draw_glow_controls = [](const char* label, GlowSettings& settings) + const auto draw_glow_controls = [](const char* label, GlowSettings& settings, const float max_radius = 30.f) { ImGui::PushID(label); ImGui::TextUnformatted(label); @@ -74,7 +74,7 @@ namespace imgui_desktop::gui if (settings.enabled) { ImGui::ColorEdit4("Color", reinterpret_cast(&settings.color), ImGuiColorEditFlags_NoInputs); - ImGui::SliderFloat("Radius", &settings.radius, 1.f, 12.f); + ImGui::SliderFloat("Radius", &settings.radius, 1.f, max_radius); ImGui::SliderFloat("Intensity", &settings.intensity, 0.f, 1.f); } ImGui::PopID(); @@ -86,6 +86,7 @@ namespace imgui_desktop::gui ImGui::SliderFloat("Top Y", &m_entity_top_y, 20.f, m_entity_bottom_y - 20.f); ImGui::SliderFloat("Bottom Y", &m_entity_bottom_y, m_entity_top_y + 20.f, vp->Size.y - 20.f); ImGui::SliderFloat("Aspect", &m_entity_aspect, 1.f, 10.f); + draw_glow_controls("Canvas light", m_canvas_glow, 500.f); } if (ImGui::CollapsingHeader("Box", ImGuiTreeNodeFlags_DefaultOpen)) @@ -256,6 +257,7 @@ namespace imgui_desktop::gui const auto cornered_box_glow = make_glow(m_cornered_box_glow); const auto bar_glow = make_glow(m_bar_glow); const auto label_glow = make_glow(m_label_glow); + const auto canvas_glow = make_glow(m_canvas_glow); const Paint vertical_bar_color = m_gradient_bars ? Paint{omath::hud::Gradient{bar_value_color, bar_value_color, red, red}} : Paint{m_bar_color}; @@ -283,6 +285,7 @@ namespace imgui_desktop::gui omath::hud::EntityOverlay({m_entity_x, m_entity_top_y}, {m_entity_x, m_entity_bottom_y}, m_entity_aspect, std::make_shared()) .contents( + when(canvas_glow.has_value(), CanvasGlow{canvas_glow.value_or(Glow{m_canvas_glow.color})}), // ── Boxes ──────────────────────────────────────────────────── when(m_show_box, Box{m_box_color, box_fill, m_box_outline, m_box_thickness, box_glow}), when(m_show_cornered_box, diff --git a/examples/example_hud/gui/main_window.hpp b/examples/example_hud/gui/main_window.hpp index 26e3ef27..c6b66781 100644 --- a/examples/example_hud/gui/main_window.hpp +++ b/examples/example_hud/gui/main_window.hpp @@ -76,6 +76,7 @@ namespace imgui_desktop::gui GlowSettings m_cornered_box_glow{{1.f, 0.f, 1.f, 0.8f}}; GlowSettings m_bar_glow{{1.f, 0.f, 0.f, 0.8f}}; GlowSettings m_label_glow; + GlowSettings m_canvas_glow{{1.f, 0.5f, 0.f, 0.8f}, 100.f}; // Skeleton omath::Color m_skel_color = omath::Color::from_rgba(255, 255, 255, 200); diff --git a/include/omath/hud/entity_overlay.hpp b/include/omath/hud/entity_overlay.hpp index f8b3712c..c1f644ab 100644 --- a/include/omath/hud/entity_overlay.hpp +++ b/include/omath/hud/entity_overlay.hpp @@ -248,6 +248,7 @@ namespace omath::hud } void dispatch(const widget::Box& box); + void dispatch(const widget::CanvasGlow& canvas_glow); void dispatch(const widget::CorneredBox& cornered_box); void dispatch(const widget::DashedBox& dashed_box); void dispatch(const widget::RightSide& right_side); @@ -268,6 +269,7 @@ namespace omath::hud float thickness) const; void draw_glow_rectangle(const Vector2& min, const Vector2& max, const std::optional& glow) const; + void draw_canvas_glow(const widget::CanvasGlow& canvas_glow) const; void draw_filled_rectangle(const Vector2& min, const Vector2& max, const widget::Paint& paint) const; void draw_dashed_line(const Vector2& from, const Vector2& to, const Color& color, float dash_len, diff --git a/include/omath/hud/entity_overlay_widgets.hpp b/include/omath/hud/entity_overlay_widgets.hpp index 5c4d1b95..21dfdbc2 100644 --- a/include/omath/hud/entity_overlay_widgets.hpp +++ b/include/omath/hud/entity_overlay_widgets.hpp @@ -39,6 +39,11 @@ namespace omath::hud::widget float intensity = 1.f; }; + struct CanvasGlow + { + Glow glow; + }; + // ── Standalone widgets ──────────────────────────────────────────────────── struct Box { diff --git a/source/hud/entity_overlay.cpp b/source/hud/entity_overlay.cpp index ef22d623..9bad5058 100644 --- a/source/hud/entity_overlay.cpp +++ b/source/hud/entity_overlay.cpp @@ -476,6 +476,43 @@ namespace omath::hud draw_glow_polyline(points, *glow, 1.f); } + void EntityOverlay::draw_canvas_glow(const widget::CanvasGlow& canvas_glow) const + { + constexpr int layers = 32; + constexpr int segments = 64; + const auto min = m_canvas.top_left_corner; + const auto max = m_canvas.bottom_right_corner; + const auto center = (min + max) * 0.5f; + const float half_width = std::abs(max.x - min.x) * 0.5f; + const float half_height = std::abs(max.y - min.y) * 0.5f; + if (half_width <= 0.f || half_height <= 0.f) + return; + const float vertical_radius = std::min(std::max(canvas_glow.glow.radius, 0.f), half_height); + const float horizontal_radius = vertical_radius * half_width / half_height; + if (vertical_radius <= 0.f || horizontal_radius <= 0.f) + return; + + const auto value = canvas_glow.glow.color.value(); + const float intensity = std::clamp(canvas_glow.glow.intensity, 0.f, 1.f); + for (int layer = 0; layer < layers; ++layer) + { + const float progress = static_cast(layer) / static_cast(layers - 1); + const float scale = 1.f - progress * 0.95f; + const float alpha = value.w * intensity / static_cast(layers); + const Color color{value.x, value.y, value.z, alpha}; + std::array, segments> points; + for (int segment = 0; segment < segments; ++segment) + { + const float angle = + static_cast(segment) / static_cast(segments) * 2.f * std::numbers::pi_v; + points[segment] = center + + Vector2{std::cos(angle) * horizontal_radius * scale, + std::sin(angle) * vertical_radius * scale}; + } + m_renderer->add_filled_polyline(points, color); + } + } + void EntityOverlay::draw_filled_rectangle(const Vector2& min, const Vector2& max, const widget::Paint& paint) const { @@ -726,6 +763,11 @@ namespace omath::hud box.fill); } + void EntityOverlay::dispatch(const widget::CanvasGlow& canvas_glow) + { + draw_canvas_glow(canvas_glow); + } + void EntityOverlay::dispatch(const widget::CorneredBox& cornered_box) { if (cornered_box.glow) From cbe220664fa021d2be6542776fa9181a0e466316 Mon Sep 17 00:00:00 2001 From: Orange Date: Sat, 11 Jul 2026 22:39:18 +0300 Subject: [PATCH 5/9] added outside glow --- examples/example_hud/gui/main_window.cpp | 18 +++-- examples/example_hud/gui/main_window.hpp | 3 + include/omath/hud/entity_overlay_widgets.hpp | 10 +++ include/omath/hud/hud_renderer_interface.hpp | 6 ++ .../renderer_realizations/imgui_renderer.hpp | 2 + source/hud/entity_overlay.cpp | 75 ++++++++++++++----- .../renderer_realizations/imgui_renderer.cpp | 7 ++ 7 files changed, 98 insertions(+), 23 deletions(-) diff --git a/examples/example_hud/gui/main_window.cpp b/examples/example_hud/gui/main_window.cpp index cb3cd5b2..89269fd3 100644 --- a/examples/example_hud/gui/main_window.cpp +++ b/examples/example_hud/gui/main_window.cpp @@ -66,7 +66,7 @@ namespace imgui_desktop::gui ImGui::Begin("Controls", &m_opened, ImGuiWindowFlags_NoMove | ImGuiWindowFlags_NoResize | ImGuiWindowFlags_NoCollapse); ImGui::PushItemWidth(160.f); - const auto draw_glow_controls = [](const char* label, GlowSettings& settings, const float max_radius = 30.f) + const auto draw_glow_controls = [](const char* label, GlowSettings& settings) { ImGui::PushID(label); ImGui::TextUnformatted(label); @@ -74,8 +74,8 @@ namespace imgui_desktop::gui if (settings.enabled) { ImGui::ColorEdit4("Color", reinterpret_cast(&settings.color), ImGuiColorEditFlags_NoInputs); - ImGui::SliderFloat("Radius", &settings.radius, 1.f, max_radius); - ImGui::SliderFloat("Intensity", &settings.intensity, 0.f, 1.f); + ImGui::InputFloat("Radius", &settings.radius); + ImGui::InputFloat("Intensity", &settings.intensity); } ImGui::PopID(); }; @@ -86,7 +86,13 @@ namespace imgui_desktop::gui ImGui::SliderFloat("Top Y", &m_entity_top_y, 20.f, m_entity_bottom_y - 20.f); ImGui::SliderFloat("Bottom Y", &m_entity_bottom_y, m_entity_top_y + 20.f, vp->Size.y - 20.f); ImGui::SliderFloat("Aspect", &m_entity_aspect, 1.f, 10.f); - draw_glow_controls("Canvas light", m_canvas_glow, 500.f); + draw_glow_controls("Canvas light", m_canvas_glow); + if (m_canvas_glow.enabled) + { + ImGui::InputInt("Blur layers##canvas", &m_canvas_glow_layers); + ImGui::Combo("Mode##canvas", &m_canvas_glow_mode, "Inside\0Outside\0Both\0"); + ImGui::InputFloat("Rounding##canvas", &m_canvas_glow_rounding); + } } if (ImGui::CollapsingHeader("Box", ImGuiTreeNodeFlags_DefaultOpen)) @@ -285,7 +291,9 @@ namespace imgui_desktop::gui omath::hud::EntityOverlay({m_entity_x, m_entity_top_y}, {m_entity_x, m_entity_bottom_y}, m_entity_aspect, std::make_shared()) .contents( - when(canvas_glow.has_value(), CanvasGlow{canvas_glow.value_or(Glow{m_canvas_glow.color})}), + when(canvas_glow.has_value(), + CanvasGlow{canvas_glow.value_or(Glow{m_canvas_glow.color}), m_canvas_glow_layers, + static_cast(m_canvas_glow_mode), m_canvas_glow_rounding}), // ── Boxes ──────────────────────────────────────────────────── when(m_show_box, Box{m_box_color, box_fill, m_box_outline, m_box_thickness, box_glow}), when(m_show_cornered_box, diff --git a/examples/example_hud/gui/main_window.hpp b/examples/example_hud/gui/main_window.hpp index c6b66781..1f1fd3e6 100644 --- a/examples/example_hud/gui/main_window.hpp +++ b/examples/example_hud/gui/main_window.hpp @@ -77,6 +77,9 @@ namespace imgui_desktop::gui GlowSettings m_bar_glow{{1.f, 0.f, 0.f, 0.8f}}; GlowSettings m_label_glow; GlowSettings m_canvas_glow{{1.f, 0.5f, 0.f, 0.8f}, 100.f}; + int m_canvas_glow_layers = 64; + int m_canvas_glow_mode = 2; + float m_canvas_glow_rounding = 40.f; // Skeleton omath::Color m_skel_color = omath::Color::from_rgba(255, 255, 255, 200); diff --git a/include/omath/hud/entity_overlay_widgets.hpp b/include/omath/hud/entity_overlay_widgets.hpp index 21dfdbc2..8563f0c0 100644 --- a/include/omath/hud/entity_overlay_widgets.hpp +++ b/include/omath/hud/entity_overlay_widgets.hpp @@ -39,9 +39,19 @@ namespace omath::hud::widget float intensity = 1.f; }; + enum class CanvasGlowMode + { + INSIDE, + OUTSIDE, + BOTH, + }; + struct CanvasGlow { Glow glow; + int layers = 64; + CanvasGlowMode mode = CanvasGlowMode::INSIDE; + float rounding = 20.f; }; // ── Standalone widgets ──────────────────────────────────────────────────── diff --git a/include/omath/hud/hud_renderer_interface.hpp b/include/omath/hud/hud_renderer_interface.hpp index 3ebc5f41..35012465 100644 --- a/include/omath/hud/hud_renderer_interface.hpp +++ b/include/omath/hud/hud_renderer_interface.hpp @@ -38,6 +38,12 @@ namespace omath::hud virtual void add_filled_circle(const Vector2& center, float radius, const Color& color, int segments = 0) = 0; + virtual void add_filled_ellipse(const Vector2& center, const Vector2& radius, const Color& color, + int segments = 0) + { + add_filled_circle(center, std::min(radius.x, radius.y), color, segments); + } + /// Draw an arc (partial circle outline). Angles in radians, 0 = right (+X), counter-clockwise. virtual void add_arc(const Vector2& center, float radius, float a_min, float a_max, const Color& color, float thickness, int segments = 0) = 0; diff --git a/include/omath/hud/renderer_realizations/imgui_renderer.hpp b/include/omath/hud/renderer_realizations/imgui_renderer.hpp index 6632a487..a509a74c 100644 --- a/include/omath/hud/renderer_realizations/imgui_renderer.hpp +++ b/include/omath/hud/renderer_realizations/imgui_renderer.hpp @@ -24,6 +24,8 @@ namespace omath::hud int segments = 0) override; void add_filled_circle(const Vector2& center, float radius, const Color& color, int segments = 0) override; + void add_filled_ellipse(const Vector2& center, const Vector2& radius, const Color& color, + int segments = 0) override; void add_arc(const Vector2& center, float radius, float a_min, float a_max, const Color& color, float thickness, int segments = 0) override; void add_image(const std::any& texture_id, const Vector2& min, const Vector2& max, diff --git a/source/hud/entity_overlay.cpp b/source/hud/entity_overlay.cpp index 9bad5058..8ea39134 100644 --- a/source/hud/entity_overlay.cpp +++ b/source/hud/entity_overlay.cpp @@ -388,7 +388,7 @@ namespace omath::hud const int radius = static_cast(std::ceil(std::max(glow->radius, 0.f))); for (int layer = radius; layer > 0; --layer) { - const float alpha = glow->color.value().w * std::clamp(glow->intensity, 0.f, 1.f) + const float alpha = glow->color.value().w * std::max(glow->intensity, 0.f) * (1.f - static_cast(layer - 1) / static_cast(radius + 1)); const auto value = glow->color.value(); const Color color{value.x, value.y, value.z, alpha / static_cast(radius)}; @@ -442,7 +442,7 @@ namespace omath::hud { const float falloff = 1.f - static_cast(layer - 1) / static_cast(radius + 1); const Color color{value.x, value.y, value.z, - value.w * std::clamp(glow.intensity, 0.f, 1.f) * falloff / static_cast(radius)}; + value.w * std::max(glow.intensity, 0.f) * falloff / static_cast(radius)}; m_renderer->add_polyline(points, color, thickness + static_cast(layer) * 2.f); } } @@ -456,7 +456,7 @@ namespace omath::hud { const float falloff = 1.f - static_cast(layer - 1) / static_cast(radius + 1); const Color color{value.x, value.y, value.z, - value.w * std::clamp(glow.intensity, 0.f, 1.f) * falloff / static_cast(radius)}; + value.w * std::max(glow.intensity, 0.f) * falloff / static_cast(radius)}; m_renderer->add_line(from, to, color, thickness + static_cast(layer) * 2.f); } } @@ -478,10 +478,58 @@ namespace omath::hud void EntityOverlay::draw_canvas_glow(const widget::CanvasGlow& canvas_glow) const { - constexpr int layers = 32; - constexpr int segments = 64; + constexpr int segments = 96; + const int layers = std::max(canvas_glow.layers, 2); const auto min = m_canvas.top_left_corner; const auto max = m_canvas.bottom_right_corner; + const auto value = canvas_glow.glow.color.value(); + const float intensity = std::max(canvas_glow.glow.intensity, 0.f); + + if (canvas_glow.mode == widget::CanvasGlowMode::OUTSIDE || canvas_glow.mode == widget::CanvasGlowMode::BOTH) + { + constexpr int corner_segments = 12; + const float max_rounding = std::min(std::abs(max.x - min.x), std::abs(max.y - min.y)) * 0.5f; + const float rounding = std::clamp(canvas_glow.rounding, 0.f, max_rounding); + const float extent = std::max(canvas_glow.glow.radius, 0.f); + const float stroke = std::max(extent / static_cast(layers - 1) * 2.f, 1.f); + for (int layer = 0; layer < layers; ++layer) + { + const float progress = static_cast(layer) / static_cast(layers - 1); + const float expansion = extent * (1.f - progress); + const float falloff = progress * progress * (3.f - 2.f * progress); + const Color color{value.x, value.y, value.z, value.w * intensity * falloff * 0.35f}; + const auto expanded_min = min - Vector2{expansion, expansion}; + const auto expanded_max = max + Vector2{expansion, expansion}; + const float expanded_rounding = rounding + expansion; + const std::array corner_centers = { + expanded_min + Vector2{expanded_rounding, expanded_rounding}, + Vector2{expanded_max.x - expanded_rounding, expanded_min.y + expanded_rounding}, + expanded_max - Vector2{expanded_rounding, expanded_rounding}, + Vector2{expanded_min.x + expanded_rounding, expanded_max.y - expanded_rounding}, + }; + std::array, corner_segments * 4> points; + for (int corner = 0; corner < 4; ++corner) + { + const float start_angle = + std::numbers::pi_v + static_cast(corner) * std::numbers::pi_v * 0.5f; + for (int segment = 0; segment < corner_segments; ++segment) + { + const float arc_progress = + static_cast(segment) / static_cast(corner_segments - 1); + const float angle = start_angle + arc_progress * std::numbers::pi_v * 0.5f; + points[corner * corner_segments + segment] = + corner_centers[corner] + + Vector2{std::cos(angle) * expanded_rounding, + std::sin(angle) * expanded_rounding}; + } + } + m_renderer->add_polyline(points, color, stroke); + } + } + + if (canvas_glow.mode == widget::CanvasGlowMode::OUTSIDE) + return; + const auto center = (min + max) * 0.5f; const float half_width = std::abs(max.x - min.x) * 0.5f; const float half_height = std::abs(max.y - min.y) * 0.5f; @@ -492,24 +540,15 @@ namespace omath::hud if (vertical_radius <= 0.f || horizontal_radius <= 0.f) return; - const auto value = canvas_glow.glow.color.value(); - const float intensity = std::clamp(canvas_glow.glow.intensity, 0.f, 1.f); for (int layer = 0; layer < layers; ++layer) { const float progress = static_cast(layer) / static_cast(layers - 1); const float scale = 1.f - progress * 0.95f; - const float alpha = value.w * intensity / static_cast(layers); + const float falloff = progress * progress; + const float alpha = value.w * intensity * falloff * 3.f / static_cast(layers); const Color color{value.x, value.y, value.z, alpha}; - std::array, segments> points; - for (int segment = 0; segment < segments; ++segment) - { - const float angle = - static_cast(segment) / static_cast(segments) * 2.f * std::numbers::pi_v; - points[segment] = center - + Vector2{std::cos(angle) * horizontal_radius * scale, - std::sin(angle) * vertical_radius * scale}; - } - m_renderer->add_filled_polyline(points, color); + m_renderer->add_filled_ellipse(center, {horizontal_radius * scale, vertical_radius * scale}, color, + segments); } } diff --git a/source/hud/renderer_realizations/imgui_renderer.cpp b/source/hud/renderer_realizations/imgui_renderer.cpp index 65e15b3b..6f8f9c03 100644 --- a/source/hud/renderer_realizations/imgui_renderer.cpp +++ b/source/hud/renderer_realizations/imgui_renderer.cpp @@ -65,6 +65,13 @@ namespace omath::hud ImGui::GetBackgroundDrawList()->AddCircleFilled(center.to_im_vec2(), radius, color.to_im_color(), segments); } + void ImguiHudRenderer::add_filled_ellipse(const Vector2& center, const Vector2& radius, + const Color& color, const int segments) + { + ImGui::GetBackgroundDrawList()->AddEllipseFilled(center.to_im_vec2(), radius.to_im_vec2(), color.to_im_color(), + 0.f, segments); + } + void ImguiHudRenderer::add_arc(const Vector2& center, const float radius, const float a_min, const float a_max, const Color& color, const float thickness, const int segments) { From fb1ffac240b7d57df0d3a6481c431b437f6032ba Mon Sep 17 00:00:00 2001 From: Orange Date: Sat, 11 Jul 2026 23:17:14 +0300 Subject: [PATCH 6/9] improvement --- examples/example_hud/gui/main_window.cpp | 6 +- examples/example_hud/gui/main_window.hpp | 1 - include/omath/hud/entity_overlay_widgets.hpp | 8 -- include/omath/hud/hud_renderer_interface.hpp | 12 +-- .../renderer_realizations/imgui_renderer.hpp | 4 +- source/hud/entity_overlay.cpp | 95 +++++++------------ .../renderer_realizations/imgui_renderer.cpp | 18 ++-- 7 files changed, 56 insertions(+), 88 deletions(-) diff --git a/examples/example_hud/gui/main_window.cpp b/examples/example_hud/gui/main_window.cpp index 89269fd3..c56cecb2 100644 --- a/examples/example_hud/gui/main_window.cpp +++ b/examples/example_hud/gui/main_window.cpp @@ -90,7 +90,6 @@ namespace imgui_desktop::gui if (m_canvas_glow.enabled) { ImGui::InputInt("Blur layers##canvas", &m_canvas_glow_layers); - ImGui::Combo("Mode##canvas", &m_canvas_glow_mode, "Inside\0Outside\0Both\0"); ImGui::InputFloat("Rounding##canvas", &m_canvas_glow_rounding); } } @@ -291,9 +290,8 @@ namespace imgui_desktop::gui omath::hud::EntityOverlay({m_entity_x, m_entity_top_y}, {m_entity_x, m_entity_bottom_y}, m_entity_aspect, std::make_shared()) .contents( - when(canvas_glow.has_value(), - CanvasGlow{canvas_glow.value_or(Glow{m_canvas_glow.color}), m_canvas_glow_layers, - static_cast(m_canvas_glow_mode), m_canvas_glow_rounding}), + when(canvas_glow.has_value(), CanvasGlow{canvas_glow.value_or(Glow{m_canvas_glow.color}), + m_canvas_glow_layers, m_canvas_glow_rounding}), // ── Boxes ──────────────────────────────────────────────────── when(m_show_box, Box{m_box_color, box_fill, m_box_outline, m_box_thickness, box_glow}), when(m_show_cornered_box, diff --git a/examples/example_hud/gui/main_window.hpp b/examples/example_hud/gui/main_window.hpp index 1f1fd3e6..2ed2e7f1 100644 --- a/examples/example_hud/gui/main_window.hpp +++ b/examples/example_hud/gui/main_window.hpp @@ -78,7 +78,6 @@ namespace imgui_desktop::gui GlowSettings m_label_glow; GlowSettings m_canvas_glow{{1.f, 0.5f, 0.f, 0.8f}, 100.f}; int m_canvas_glow_layers = 64; - int m_canvas_glow_mode = 2; float m_canvas_glow_rounding = 40.f; // Skeleton diff --git a/include/omath/hud/entity_overlay_widgets.hpp b/include/omath/hud/entity_overlay_widgets.hpp index 8563f0c0..e1a820e7 100644 --- a/include/omath/hud/entity_overlay_widgets.hpp +++ b/include/omath/hud/entity_overlay_widgets.hpp @@ -39,18 +39,10 @@ namespace omath::hud::widget float intensity = 1.f; }; - enum class CanvasGlowMode - { - INSIDE, - OUTSIDE, - BOTH, - }; - struct CanvasGlow { Glow glow; int layers = 64; - CanvasGlowMode mode = CanvasGlowMode::INSIDE; float rounding = 20.f; }; diff --git a/include/omath/hud/hud_renderer_interface.hpp b/include/omath/hud/hud_renderer_interface.hpp index 35012465..3dcfb8a2 100644 --- a/include/omath/hud/hud_renderer_interface.hpp +++ b/include/omath/hud/hud_renderer_interface.hpp @@ -20,6 +20,12 @@ namespace omath::hud virtual void add_polyline(const std::span>& vertexes, const Color& color, float thickness) = 0; + virtual void add_polyline_clipped(const std::span>& vertexes, const Vector2&, + const Vector2&, const Color& color, float thickness) + { + add_polyline(vertexes, color, thickness); + } + virtual void add_filled_polyline(const std::span>& vertexes, const Color& color) = 0; virtual void add_rectangle(const Vector2& min, const Vector2& max, const Color& color) = 0; @@ -38,12 +44,6 @@ namespace omath::hud virtual void add_filled_circle(const Vector2& center, float radius, const Color& color, int segments = 0) = 0; - virtual void add_filled_ellipse(const Vector2& center, const Vector2& radius, const Color& color, - int segments = 0) - { - add_filled_circle(center, std::min(radius.x, radius.y), color, segments); - } - /// Draw an arc (partial circle outline). Angles in radians, 0 = right (+X), counter-clockwise. virtual void add_arc(const Vector2& center, float radius, float a_min, float a_max, const Color& color, float thickness, int segments = 0) = 0; diff --git a/include/omath/hud/renderer_realizations/imgui_renderer.hpp b/include/omath/hud/renderer_realizations/imgui_renderer.hpp index a509a74c..f370bbfd 100644 --- a/include/omath/hud/renderer_realizations/imgui_renderer.hpp +++ b/include/omath/hud/renderer_realizations/imgui_renderer.hpp @@ -15,6 +15,8 @@ namespace omath::hud float thickness) override; void add_polyline(const std::span>& vertexes, const Color& color, float thickness) override; + void add_polyline_clipped(const std::span>& vertexes, const Vector2& clip_min, + const Vector2& clip_max, const Color& color, float thickness) override; void add_filled_polyline(const std::span>& vertexes, const Color& color) override; void add_rectangle(const Vector2& min, const Vector2& max, const Color& color) override; void add_filled_rectangle(const Vector2& min, const Vector2& max, const Color& color) override; @@ -24,8 +26,6 @@ namespace omath::hud int segments = 0) override; void add_filled_circle(const Vector2& center, float radius, const Color& color, int segments = 0) override; - void add_filled_ellipse(const Vector2& center, const Vector2& radius, const Color& color, - int segments = 0) override; void add_arc(const Vector2& center, float radius, float a_min, float a_max, const Color& color, float thickness, int segments = 0) override; void add_image(const std::any& texture_id, const Vector2& min, const Vector2& max, diff --git a/source/hud/entity_overlay.cpp b/source/hud/entity_overlay.cpp index 8ea39134..2b0aed25 100644 --- a/source/hud/entity_overlay.cpp +++ b/source/hud/entity_overlay.cpp @@ -2,6 +2,7 @@ // Created by orange on 13.03.2026. // #include "omath/hud/entity_overlay.hpp" +#include namespace omath::hud { @@ -478,77 +479,51 @@ namespace omath::hud void EntityOverlay::draw_canvas_glow(const widget::CanvasGlow& canvas_glow) const { - constexpr int segments = 96; const int layers = std::max(canvas_glow.layers, 2); const auto min = m_canvas.top_left_corner; const auto max = m_canvas.bottom_right_corner; const auto value = canvas_glow.glow.color.value(); const float intensity = std::max(canvas_glow.glow.intensity, 0.f); - if (canvas_glow.mode == widget::CanvasGlowMode::OUTSIDE || canvas_glow.mode == widget::CanvasGlowMode::BOTH) + constexpr int corner_segments = 12; + const float max_rounding = std::min(std::abs(max.x - min.x), std::abs(max.y - min.y)) * 0.5f; + const float rounding = std::clamp(canvas_glow.rounding, 0.f, max_rounding); + const float extent = std::max(canvas_glow.glow.radius, 0.f); + const float stroke = std::max(extent / static_cast(layers - 1) * 2.f, 1.f); + for (int layer = 0; layer < layers; ++layer) { - constexpr int corner_segments = 12; - const float max_rounding = std::min(std::abs(max.x - min.x), std::abs(max.y - min.y)) * 0.5f; - const float rounding = std::clamp(canvas_glow.rounding, 0.f, max_rounding); - const float extent = std::max(canvas_glow.glow.radius, 0.f); - const float stroke = std::max(extent / static_cast(layers - 1) * 2.f, 1.f); - for (int layer = 0; layer < layers; ++layer) + const float progress = static_cast(layer) / static_cast(layers - 1); + const float expansion = extent * (1.f - progress); + const float falloff = progress * progress * (3.f - 2.f * progress); + const Color color{value.x, value.y, value.z, value.w * intensity * falloff * 0.35f}; + const auto expanded_min = min - Vector2{expansion, expansion}; + const auto expanded_max = max + Vector2{expansion, expansion}; + const float expanded_rounding = rounding + expansion; + const std::array corner_centers = { + expanded_min + Vector2{expanded_rounding, expanded_rounding}, + Vector2{expanded_max.x - expanded_rounding, expanded_min.y + expanded_rounding}, + expanded_max - Vector2{expanded_rounding, expanded_rounding}, + Vector2{expanded_min.x + expanded_rounding, expanded_max.y - expanded_rounding}, + }; + std::array, corner_segments * 4> points; + for (int corner = 0; corner < 4; ++corner) { - const float progress = static_cast(layer) / static_cast(layers - 1); - const float expansion = extent * (1.f - progress); - const float falloff = progress * progress * (3.f - 2.f * progress); - const Color color{value.x, value.y, value.z, value.w * intensity * falloff * 0.35f}; - const auto expanded_min = min - Vector2{expansion, expansion}; - const auto expanded_max = max + Vector2{expansion, expansion}; - const float expanded_rounding = rounding + expansion; - const std::array corner_centers = { - expanded_min + Vector2{expanded_rounding, expanded_rounding}, - Vector2{expanded_max.x - expanded_rounding, expanded_min.y + expanded_rounding}, - expanded_max - Vector2{expanded_rounding, expanded_rounding}, - Vector2{expanded_min.x + expanded_rounding, expanded_max.y - expanded_rounding}, - }; - std::array, corner_segments * 4> points; - for (int corner = 0; corner < 4; ++corner) + const float start_angle = + std::numbers::pi_v + static_cast(corner) * std::numbers::pi_v * 0.5f; + for (int segment = 0; segment < corner_segments; ++segment) { - const float start_angle = - std::numbers::pi_v + static_cast(corner) * std::numbers::pi_v * 0.5f; - for (int segment = 0; segment < corner_segments; ++segment) - { - const float arc_progress = - static_cast(segment) / static_cast(corner_segments - 1); - const float angle = start_angle + arc_progress * std::numbers::pi_v * 0.5f; - points[corner * corner_segments + segment] = - corner_centers[corner] - + Vector2{std::cos(angle) * expanded_rounding, - std::sin(angle) * expanded_rounding}; - } + const float arc_progress = static_cast(segment) / static_cast(corner_segments - 1); + const float angle = start_angle + arc_progress * std::numbers::pi_v * 0.5f; + points[corner * corner_segments + segment] = + corner_centers[corner] + + Vector2{std::cos(angle) * expanded_rounding, std::sin(angle) * expanded_rounding}; } - m_renderer->add_polyline(points, color, stroke); } - } - - if (canvas_glow.mode == widget::CanvasGlowMode::OUTSIDE) - return; - - const auto center = (min + max) * 0.5f; - const float half_width = std::abs(max.x - min.x) * 0.5f; - const float half_height = std::abs(max.y - min.y) * 0.5f; - if (half_width <= 0.f || half_height <= 0.f) - return; - const float vertical_radius = std::min(std::max(canvas_glow.glow.radius, 0.f), half_height); - const float horizontal_radius = vertical_radius * half_width / half_height; - if (vertical_radius <= 0.f || horizontal_radius <= 0.f) - return; - - for (int layer = 0; layer < layers; ++layer) - { - const float progress = static_cast(layer) / static_cast(layers - 1); - const float scale = 1.f - progress * 0.95f; - const float falloff = progress * progress; - const float alpha = value.w * intensity * falloff * 3.f / static_cast(layers); - const Color color{value.x, value.y, value.z, alpha}; - m_renderer->add_filled_ellipse(center, {horizontal_radius * scale, vertical_radius * scale}, color, - segments); + constexpr float clip_extent = std::numeric_limits::max() * 0.25f; + m_renderer->add_polyline_clipped(points, {-clip_extent, -clip_extent}, {clip_extent, min.y}, color, stroke); + m_renderer->add_polyline_clipped(points, {-clip_extent, max.y}, {clip_extent, clip_extent}, color, stroke); + m_renderer->add_polyline_clipped(points, {-clip_extent, min.y}, {min.x, max.y}, color, stroke); + m_renderer->add_polyline_clipped(points, {max.x, min.y}, {clip_extent, max.y}, color, stroke); } } diff --git a/source/hud/renderer_realizations/imgui_renderer.cpp b/source/hud/renderer_realizations/imgui_renderer.cpp index 6f8f9c03..980b8a8a 100644 --- a/source/hud/renderer_realizations/imgui_renderer.cpp +++ b/source/hud/renderer_realizations/imgui_renderer.cpp @@ -27,6 +27,17 @@ namespace omath::hud ImDrawFlags_Closed, thickness); } + void ImguiHudRenderer::add_polyline_clipped(const std::span>& vertexes, + const Vector2& clip_min, const Vector2& clip_max, + const Color& color, const float thickness) + { + auto* draw_list = ImGui::GetBackgroundDrawList(); + draw_list->PushClipRect(clip_min.to_im_vec2(), clip_max.to_im_vec2(), true); + draw_list->AddPolyline(reinterpret_cast(vertexes.data()), static_cast(vertexes.size()), + color.to_im_color(), ImDrawFlags_Closed, thickness); + draw_list->PopClipRect(); + } + void ImguiHudRenderer::add_filled_polyline(const std::span>& vertexes, const Color& color) { ImGui::GetBackgroundDrawList()->AddConvexPolyFilled(reinterpret_cast(vertexes.data()), @@ -65,13 +76,6 @@ namespace omath::hud ImGui::GetBackgroundDrawList()->AddCircleFilled(center.to_im_vec2(), radius, color.to_im_color(), segments); } - void ImguiHudRenderer::add_filled_ellipse(const Vector2& center, const Vector2& radius, - const Color& color, const int segments) - { - ImGui::GetBackgroundDrawList()->AddEllipseFilled(center.to_im_vec2(), radius.to_im_vec2(), color.to_im_color(), - 0.f, segments); - } - void ImguiHudRenderer::add_arc(const Vector2& center, const float radius, const float a_min, const float a_max, const Color& color, const float thickness, const int segments) { From 2c6d7c2dfaf8c11c7d90894c2d7ce032da704ab4 Mon Sep 17 00:00:00 2001 From: Orange Date: Sun, 12 Jul 2026 11:10:13 +0300 Subject: [PATCH 7/9] bar fixes --- source/hud/entity_overlay.cpp | 46 +++++++++++++++++++++-------------- 1 file changed, 28 insertions(+), 18 deletions(-) diff --git a/source/hud/entity_overlay.cpp b/source/hud/entity_overlay.cpp index 2b0aed25..8f7a9c73 100644 --- a/source/hud/entity_overlay.cpp +++ b/source/hud/entity_overlay.cpp @@ -85,12 +85,14 @@ namespace omath::hud const auto max_bar_height = std::abs(m_canvas.top_right_corner.y - m_canvas.bottom_right_corner.y); const auto bar_start = Vector2{m_text_cursor_right.x + offset, m_canvas.bottom_right_corner.y}; - m_renderer->add_filled_rectangle(bar_start, bar_start + Vector2(width, -max_bar_height), bg_color); + const auto bar_min = bar_start - Vector2{0.f, max_bar_height}; + const auto bar_max = bar_start + Vector2{width, 0.f}; + const auto fill_min = bar_start - Vector2{0.f, max_bar_height * ratio}; + m_renderer->add_filled_rectangle(bar_min, bar_max, bg_color); - draw_glow_rectangle(bar_start, bar_start + Vector2(width, -max_bar_height * ratio), glow); - draw_filled_rectangle(bar_start, bar_start + Vector2(width, -max_bar_height * ratio), color); - m_renderer->add_rectangle(bar_start - Vector2(1.f, 0.f), - bar_start + Vector2(width, -max_bar_height), outline_color); + draw_glow_rectangle(fill_min, bar_max, glow); + draw_filled_rectangle(fill_min, bar_max, color); + m_renderer->add_rectangle(bar_min, bar_max, outline_color); m_text_cursor_right.x += offset + width; @@ -104,12 +106,14 @@ namespace omath::hud const auto max_bar_height = std::abs(m_canvas.top_left_corner.y - m_canvas.bottom_right_corner.y); const auto bar_start = Vector2{m_text_cursor_left.x - (offset + width), m_canvas.bottom_left_corner.y}; - m_renderer->add_filled_rectangle(bar_start, bar_start + Vector2(width, -max_bar_height), bg_color); + const auto bar_min = bar_start - Vector2{0.f, max_bar_height}; + const auto bar_max = bar_start + Vector2{width, 0.f}; + const auto fill_min = bar_start - Vector2{0.f, max_bar_height * ratio}; + m_renderer->add_filled_rectangle(bar_min, bar_max, bg_color); - draw_glow_rectangle(bar_start, bar_start + Vector2(width, -max_bar_height * ratio), glow); - draw_filled_rectangle(bar_start, bar_start + Vector2(width, -max_bar_height * ratio), color); - m_renderer->add_rectangle(bar_start - Vector2(1.f, 0.f), - bar_start + Vector2(width, -max_bar_height), outline_color); + draw_glow_rectangle(fill_min, bar_max, glow); + draw_filled_rectangle(fill_min, bar_max, color); + m_renderer->add_rectangle(bar_min, bar_max, outline_color); m_text_cursor_left.x -= offset + width; @@ -143,11 +147,14 @@ namespace omath::hud const auto max_bar_width = std::abs(m_canvas.top_left_corner.x - m_canvas.bottom_right_corner.x); const auto bar_start = Vector2{m_canvas.top_left_corner.x, m_text_cursor_top.y - offset}; - m_renderer->add_filled_rectangle(bar_start, bar_start + Vector2(max_bar_width, -height), bg_color); + const auto bar_min = bar_start - Vector2{0.f, height}; + const auto bar_max = bar_start + Vector2{max_bar_width, 0.f}; + const auto fill_max = Vector2{bar_start.x + max_bar_width * ratio, bar_start.y}; + m_renderer->add_filled_rectangle(bar_min, bar_max, bg_color); - draw_glow_rectangle(bar_start, bar_start + Vector2(max_bar_width * ratio, -height), glow); - draw_filled_rectangle(bar_start, bar_start + Vector2(max_bar_width * ratio, -height), color); - m_renderer->add_rectangle(bar_start, bar_start + Vector2(max_bar_width, -height), outline_color); + draw_glow_rectangle(bar_min, fill_max, glow); + draw_filled_rectangle(bar_min, fill_max, color); + m_renderer->add_rectangle(bar_min, bar_max, outline_color); m_text_cursor_top.y -= offset + height; @@ -553,10 +560,13 @@ namespace omath::hud const auto max_bar_width = std::abs(m_canvas.bottom_right_corner.x - m_canvas.bottom_left_corner.x); const auto bar_start = Vector2{m_canvas.bottom_left_corner.x, m_text_cursor_bottom.y + offset}; - m_renderer->add_filled_rectangle(bar_start, bar_start + Vector2(max_bar_width, height), bg_color); - draw_glow_rectangle(bar_start, bar_start + Vector2(max_bar_width * ratio, height), glow); - draw_filled_rectangle(bar_start, bar_start + Vector2(max_bar_width * ratio, height), color); - m_renderer->add_rectangle(bar_start, bar_start + Vector2(max_bar_width, height), outline_color); + const auto bar_min = bar_start; + const auto bar_max = bar_start + Vector2{max_bar_width, height}; + const auto fill_max = bar_start + Vector2{max_bar_width * ratio, height}; + m_renderer->add_filled_rectangle(bar_min, bar_max, bg_color); + draw_glow_rectangle(bar_min, fill_max, glow); + draw_filled_rectangle(bar_min, fill_max, color); + m_renderer->add_rectangle(bar_min, bar_max, outline_color); m_text_cursor_bottom.y += offset + height; From feb26e01c64accf312cee74b565127e4a0b57609 Mon Sep 17 00:00:00 2001 From: Orange Date: Sun, 12 Jul 2026 11:17:50 +0300 Subject: [PATCH 8/9] improved bars --- examples/example_hud/gui/main_window.cpp | 21 +++------- include/omath/hud/entity_overlay.hpp | 10 +++-- include/omath/hud/entity_overlay_widgets.hpp | 29 +++++++++++++- source/hud/entity_overlay.cpp | 42 ++++++++++++++++---- 4 files changed, 74 insertions(+), 28 deletions(-) diff --git a/examples/example_hud/gui/main_window.cpp b/examples/example_hud/gui/main_window.cpp index c56cecb2..2dd40210 100644 --- a/examples/example_hud/gui/main_window.cpp +++ b/examples/example_hud/gui/main_window.cpp @@ -251,7 +251,6 @@ namespace imgui_desktop::gui const auto box_gradient_bottom = animated_color(m_box_gradient_bottom, 0.5f); const auto red = omath::Color{1.f, 0.f, 0.f, 1.f}; const auto green = omath::Color{0.f, 1.f, 0.f, 1.f}; - const auto bar_value_color = omath::Color{red.value() * (1.f - m_bar_value) + green.value() * m_bar_value}; const auto make_glow = [](const GlowSettings& settings) -> std::optional { if (!settings.enabled) @@ -263,16 +262,8 @@ namespace imgui_desktop::gui const auto bar_glow = make_glow(m_bar_glow); const auto label_glow = make_glow(m_label_glow); const auto canvas_glow = make_glow(m_canvas_glow); - const Paint vertical_bar_color = - m_gradient_bars ? Paint{omath::hud::Gradient{bar_value_color, bar_value_color, red, red}} - : Paint{m_bar_color}; - const Paint horizontal_bar_color = - m_gradient_bars ? Paint{omath::hud::Gradient{red, bar_value_color, bar_value_color, red}} - : Paint{m_bar_color}; - const Bar vertical_bar{vertical_bar_color, m_bar_outline_color, m_bar_bg_color, m_bar_width, - m_bar_value, m_bar_offset, bar_glow}; - const Bar horizontal_bar{horizontal_bar_color, m_bar_outline_color, m_bar_bg_color, m_bar_width, - m_bar_value, m_bar_offset, bar_glow}; + const BarPaint bar_color = m_gradient_bars ? BarPaint{BarGradient{red, green}} : BarPaint{m_bar_color}; + const Bar bar{bar_color, m_bar_outline_color, m_bar_bg_color, m_bar_width, m_bar_value, m_bar_offset, bar_glow}; const Paint box_fill = m_gradient_box_fill ? Paint{omath::hud::Gradient{box_gradient_top, box_gradient_top, box_gradient_bottom, box_gradient_bottom}} @@ -299,7 +290,7 @@ namespace imgui_desktop::gui m_corner_ratio, m_box_thickness, cornered_box_glow}), when(m_show_dashed_box, DashedBox{m_dash_color, m_dash_len, m_dash_gap, m_dash_thickness}), RightSide{ - when(m_show_right_bar, vertical_bar), + when(m_show_right_bar, bar), when(m_show_right_dashed_bar, dbar), when(m_show_right_labels, Label{{0.f, 1.f, 0.f, 1.f}, m_label_offset, @@ -319,7 +310,7 @@ namespace imgui_desktop::gui m_ring_thickness, m_ring_offset}), }, LeftSide{ - when(m_show_left_bar, vertical_bar), + when(m_show_left_bar, bar), when(m_show_left_dashed_bar, dbar), when(m_show_left_labels, Label{omath::Color::from_rgba(255, 128, 0, 255), m_label_offset, @@ -329,7 +320,7 @@ namespace imgui_desktop::gui outline_helper(m_outlined), "Level: 42"}), }, TopSide{ - when(m_show_top_bar, horizontal_bar), + when(m_show_top_bar, bar), when(m_show_top_dashed_bar, dbar), when(m_show_centered_top, Centered{Label{omath::Color::from_rgba(0, 255, 255, 255), m_label_offset, @@ -340,7 +331,7 @@ namespace imgui_desktop::gui outline_helper(m_outlined), "*BLEEDING*"}), }, BottomSide{ - when(m_show_bottom_bar, horizontal_bar), + when(m_show_bottom_bar, bar), when(m_show_bottom_dashed_bar, dbar), when(m_show_centered_bottom, Centered{Label{centered_label_color, m_label_offset, outline_helper(m_outlined), diff --git a/include/omath/hud/entity_overlay.hpp b/include/omath/hud/entity_overlay.hpp index c1f644ab..feeb0d92 100644 --- a/include/omath/hud/entity_overlay.hpp +++ b/include/omath/hud/entity_overlay.hpp @@ -41,19 +41,19 @@ namespace omath::hud float thickness = 1.f); // ── Bars ───────────────────────────────────────────────────────── - EntityOverlay& add_right_bar(const widget::Paint& color, const Color& outline_color, const Color& bg_color, + EntityOverlay& add_right_bar(const widget::BarPaint& color, const Color& outline_color, const Color& bg_color, float width, float ratio, float offset = 5.f, const std::optional& glow = std::nullopt); - EntityOverlay& add_left_bar(const widget::Paint& color, const Color& outline_color, const Color& bg_color, + EntityOverlay& add_left_bar(const widget::BarPaint& color, const Color& outline_color, const Color& bg_color, float width, float ratio, float offset = 5.f, const std::optional& glow = std::nullopt); - EntityOverlay& add_top_bar(const widget::Paint& color, const Color& outline_color, const Color& bg_color, + EntityOverlay& add_top_bar(const widget::BarPaint& color, const Color& outline_color, const Color& bg_color, float height, float ratio, float offset = 5.f, const std::optional& glow = std::nullopt); - EntityOverlay& add_bottom_bar(const widget::Paint& color, const Color& outline_color, const Color& bg_color, + EntityOverlay& add_bottom_bar(const widget::BarPaint& color, const Color& outline_color, const Color& bg_color, float height, float ratio, float offset = 5.f, const std::optional& glow = std::nullopt); @@ -272,6 +272,8 @@ namespace omath::hud void draw_canvas_glow(const widget::CanvasGlow& canvas_glow) const; void draw_filled_rectangle(const Vector2& min, const Vector2& max, const widget::Paint& paint) const; + [[nodiscard]] + static widget::Paint resolve_bar_paint(const widget::BarPaint& paint, float ratio, bool vertical); void draw_dashed_line(const Vector2& from, const Vector2& to, const Color& color, float dash_len, float gap_len, float thickness) const; void draw_dashed_fill(const Vector2& origin, const Vector2& step_dir, diff --git a/include/omath/hud/entity_overlay_widgets.hpp b/include/omath/hud/entity_overlay_widgets.hpp index e1a820e7..32f15058 100644 --- a/include/omath/hud/entity_overlay_widgets.hpp +++ b/include/omath/hud/entity_overlay_widgets.hpp @@ -9,6 +9,7 @@ #include #include #include +#include #include namespace omath::hud::widget @@ -23,6 +24,32 @@ namespace omath::hud::widget } }; + struct BarGradient + { + Color empty_color; + Color full_color; + }; + + struct BarPaint : std::variant + { + using std::variant::variant; + + constexpr BarPaint(const float red, const float green, const float blue, const float alpha) + : std::variant(Color{red, green, blue, alpha}) + { + } + + BarPaint(const Paint& paint) + { + std::visit( + [this](const auto& value) + { + this->template emplace>(value); + }, + paint); + } + }; + // ── Overloaded helper for std::visit ────────────────────────────────────── template struct Overloaded : Ts... @@ -124,7 +151,7 @@ namespace omath::hud::widget /// A filled bar. `size` is width for left/right sides, height for top/bottom. struct Bar { - Paint color; + BarPaint color; Color outline; Color bg; float size; diff --git a/source/hud/entity_overlay.cpp b/source/hud/entity_overlay.cpp index 8f7a9c73..dc8f1b0d 100644 --- a/source/hud/entity_overlay.cpp +++ b/source/hud/entity_overlay.cpp @@ -77,7 +77,7 @@ namespace omath::hud return *this; } - EntityOverlay& EntityOverlay::add_right_bar(const widget::Paint& color, const Color& outline_color, + EntityOverlay& EntityOverlay::add_right_bar(const widget::BarPaint& color, const Color& outline_color, const Color& bg_color, const float width, float ratio, const float offset, const std::optional& glow) { @@ -91,14 +91,14 @@ namespace omath::hud m_renderer->add_filled_rectangle(bar_min, bar_max, bg_color); draw_glow_rectangle(fill_min, bar_max, glow); - draw_filled_rectangle(fill_min, bar_max, color); + draw_filled_rectangle(fill_min, bar_max, resolve_bar_paint(color, ratio, true)); m_renderer->add_rectangle(bar_min, bar_max, outline_color); m_text_cursor_right.x += offset + width; return *this; } - EntityOverlay& EntityOverlay::add_left_bar(const widget::Paint& color, const Color& outline_color, + EntityOverlay& EntityOverlay::add_left_bar(const widget::BarPaint& color, const Color& outline_color, const Color& bg_color, const float width, float ratio, const float offset, const std::optional& glow) { @@ -112,7 +112,7 @@ namespace omath::hud m_renderer->add_filled_rectangle(bar_min, bar_max, bg_color); draw_glow_rectangle(fill_min, bar_max, glow); - draw_filled_rectangle(fill_min, bar_max, color); + draw_filled_rectangle(fill_min, bar_max, resolve_bar_paint(color, ratio, true)); m_renderer->add_rectangle(bar_min, bar_max, outline_color); m_text_cursor_left.x -= offset + width; @@ -139,7 +139,7 @@ namespace omath::hud return *this; } - EntityOverlay& EntityOverlay::add_top_bar(const widget::Paint& color, const Color& outline_color, + EntityOverlay& EntityOverlay::add_top_bar(const widget::BarPaint& color, const Color& outline_color, const Color& bg_color, const float height, float ratio, const float offset, const std::optional& glow) { @@ -153,7 +153,7 @@ namespace omath::hud m_renderer->add_filled_rectangle(bar_min, bar_max, bg_color); draw_glow_rectangle(bar_min, fill_max, glow); - draw_filled_rectangle(bar_min, fill_max, color); + draw_filled_rectangle(bar_min, fill_max, resolve_bar_paint(color, ratio, false)); m_renderer->add_rectangle(bar_min, bar_max, outline_color); m_text_cursor_top.y -= offset + height; @@ -552,7 +552,33 @@ namespace omath::hud }, paint); } - EntityOverlay& EntityOverlay::add_bottom_bar(const widget::Paint& color, const Color& outline_color, + + widget::Paint EntityOverlay::resolve_bar_paint(const widget::BarPaint& paint, const float ratio, + const bool vertical) + { + return std::visit( + widget::Overloaded{ + [](const Color& color) -> widget::Paint + { + return color; + }, + [](const Gradient& gradient) -> widget::Paint + { + return gradient; + }, + [&](const widget::BarGradient& gradient) -> widget::Paint + { + const float value = std::clamp(ratio, 0.f, 1.f); + const auto current = Color{gradient.empty_color.value() * (1.f - value) + + gradient.full_color.value() * value}; + if (vertical) + return Gradient{current, current, gradient.empty_color, gradient.empty_color}; + return Gradient{gradient.empty_color, current, current, gradient.empty_color}; + }, + }, + paint); + } + EntityOverlay& EntityOverlay::add_bottom_bar(const widget::BarPaint& color, const Color& outline_color, const Color& bg_color, const float height, float ratio, const float offset, const std::optional& glow) { @@ -565,7 +591,7 @@ namespace omath::hud const auto fill_max = bar_start + Vector2{max_bar_width * ratio, height}; m_renderer->add_filled_rectangle(bar_min, bar_max, bg_color); draw_glow_rectangle(bar_min, fill_max, glow); - draw_filled_rectangle(bar_min, fill_max, color); + draw_filled_rectangle(bar_min, fill_max, resolve_bar_paint(color, ratio, false)); m_renderer->add_rectangle(bar_min, bar_max, outline_color); m_text_cursor_bottom.y += offset + height; From 238d6aef4ecad47d9536171a0a7ea54a8a2ad677 Mon Sep 17 00:00:00 2001 From: Orange Date: Sun, 12 Jul 2026 11:27:34 +0300 Subject: [PATCH 9/9] improve skeleton esp --- examples/example_hud/gui/main_window.cpp | 40 +++++++++++++++++++- include/omath/hud/entity_overlay.hpp | 1 + include/omath/hud/entity_overlay_widgets.hpp | 30 +++++++++++++++ source/hud/entity_overlay.cpp | 13 ++++++- 4 files changed, 82 insertions(+), 2 deletions(-) diff --git a/examples/example_hud/gui/main_window.cpp b/examples/example_hud/gui/main_window.cpp index 2dd40210..f36db284 100644 --- a/examples/example_hud/gui/main_window.cpp +++ b/examples/example_hud/gui/main_window.cpp @@ -237,6 +237,44 @@ namespace imgui_desktop::gui const auto* vp = ImGui::GetMainViewport(); const DashedBar dbar{m_bar_color, m_bar_outline_color, m_bar_bg_color, m_bar_width, m_bar_value, m_bar_dash_len, m_bar_dash_gap, m_bar_offset}; + const float entity_height = m_entity_bottom_y - m_entity_top_y; + const float entity_half_width = entity_height / m_entity_aspect; + const auto joint = [&](const float x, const float y) + { + return omath::Vector2{m_entity_x + (x * 2.f - 1.f) * entity_half_width, + m_entity_top_y + y * entity_height}; + }; + const auto head = joint(0.5f, 0.1f); + const auto neck = joint(0.5f, 0.22f); + const auto torso = joint(0.5f, 0.5f); + const auto left_shoulder = joint(0.3f, 0.25f); + const auto right_shoulder = joint(0.7f, 0.25f); + const auto left_elbow = joint(0.18f, 0.42f); + const auto right_elbow = joint(0.82f, 0.42f); + const auto left_hand = joint(0.1f, 0.58f); + const auto right_hand = joint(0.9f, 0.58f); + const auto left_hip = joint(0.4f, 0.55f); + const auto right_hip = joint(0.6f, 0.55f); + const auto left_knee = joint(0.36f, 0.75f); + const auto right_knee = joint(0.64f, 0.75f); + const auto left_foot = joint(0.3f, 0.95f); + const auto right_foot = joint(0.7f, 0.95f); + const std::array skeleton_bones = { + Bone{head, neck}, + Bone{neck, torso}, + Bone{neck, left_shoulder}, + Bone{left_shoulder, left_elbow}, + Bone{left_elbow, left_hand}, + Bone{neck, right_shoulder}, + Bone{right_shoulder, right_elbow}, + Bone{right_elbow, right_hand}, + Bone{torso, left_hip}, + Bone{left_hip, left_knee}, + Bone{left_knee, left_foot}, + Bone{torso, right_hip}, + Bone{right_hip, right_knee}, + Bone{right_knee, right_foot}, + }; const auto animated_color = [&](const omath::Color& color, const float hue_offset) { if (!m_animate_gradients) @@ -341,7 +379,7 @@ namespace imgui_desktop::gui }, when(m_show_aim, AimDot{{m_entity_x, m_entity_top_y + 40.f}, m_aim_color, m_aim_radius}), when(m_show_scan, ScanMarker{m_scan_color, m_scan_outline, m_scan_outline_thickness}), - when(m_show_skeleton, Skeleton{m_skel_color, m_skel_thickness}), + when(m_show_skeleton, Skeleton{skeleton_bones, m_skel_color, m_skel_thickness}), when(m_show_proj, ProjectileAim{{m_proj_pos_x, m_proj_pos_y}, m_proj_color, m_proj_size, diff --git a/include/omath/hud/entity_overlay.hpp b/include/omath/hud/entity_overlay.hpp index feeb0d92..2be16154 100644 --- a/include/omath/hud/entity_overlay.hpp +++ b/include/omath/hud/entity_overlay.hpp @@ -184,6 +184,7 @@ namespace omath::hud EntityOverlay& add_snap_line(const Vector2& start_pos, const Color& color, float width); EntityOverlay& add_skeleton(const Color& color, float thickness = 1.f); + EntityOverlay& add_skeleton(std::span bones, const Color& color, float thickness = 1.f); // ── Declarative interface ───────────────────────────────────────── /// Pass any combination of widget:: descriptor structs (and std::optional diff --git a/include/omath/hud/entity_overlay_widgets.hpp b/include/omath/hud/entity_overlay_widgets.hpp index 32f15058..3cca92d6 100644 --- a/include/omath/hud/entity_overlay_widgets.hpp +++ b/include/omath/hud/entity_overlay_widgets.hpp @@ -6,11 +6,14 @@ #include "omath/linear_algebra/vector2.hpp" #include "omath/utility/color.hpp" #include +#include #include #include +#include #include #include #include +#include namespace omath::hud::widget { @@ -106,10 +109,37 @@ namespace omath::hud::widget float thickness = 1.f; }; + struct Bone + { + Vector2 start; + Vector2 end; + }; + struct Skeleton { + std::vector bones; Color color; float thickness = 1.f; + + Skeleton(const Color& color, const float thickness = 1.f): color(color), thickness(thickness) + { + } + + Skeleton(const std::span bones, const Color& color, const float thickness = 1.f) + : bones(bones.begin(), bones.end()), color(color), thickness(thickness) + { + } + + Skeleton(const std::initializer_list bones, const Color& color, const float thickness = 1.f) + : bones(bones), color(color), thickness(thickness) + { + } + + template + Skeleton(const std::array& bones, const Color& color, const float thickness = 1.f) + : Skeleton(std::span{bones}, color, thickness) + { + } }; struct SnapLine { diff --git a/source/hud/entity_overlay.cpp b/source/hud/entity_overlay.cpp index dc8f1b0d..3835dd27 100644 --- a/source/hud/entity_overlay.cpp +++ b/source/hud/entity_overlay.cpp @@ -337,6 +337,14 @@ namespace omath::hud return *this; } + EntityOverlay& EntityOverlay::add_skeleton(const std::span bones, const Color& color, + const float thickness) + { + for (const auto& bone : bones) + m_renderer->add_line(bone.start, bone.end, color, thickness); + return *this; + } + void EntityOverlay::draw_dashed_line(const Vector2& from, const Vector2& to, const Color& color, const float dash_len, const float gap_len, const float thickness) const { @@ -848,7 +856,10 @@ namespace omath::hud void EntityOverlay::dispatch(const widget::Skeleton& skeleton) { - add_skeleton(skeleton.color, skeleton.thickness); + if (skeleton.bones.empty()) + add_skeleton(skeleton.color, skeleton.thickness); + else + add_skeleton(skeleton.bones, skeleton.color, skeleton.thickness); } void EntityOverlay::dispatch(const widget::SnapLine& snap_line)