mirror of
https://github.com/orange-cpp/omath.git
synced 2026-08-09 14:32:05 +00:00
Compare commits
7 Commits
26823609e7
..
v5.5.0
| Author | SHA1 | Date | |
|---|---|---|---|
| 945f80241c | |||
| 238d6aef4e | |||
| feb26e01c6 | |||
| 2c6d7c2dfa | |||
| fb1ffac240 | |||
| cbe220664f | |||
| 1618a41318 |
@@ -74,8 +74,8 @@ namespace imgui_desktop::gui
|
||||
if (settings.enabled)
|
||||
{
|
||||
ImGui::ColorEdit4("Color", reinterpret_cast<float*>(&settings.color), ImGuiColorEditFlags_NoInputs);
|
||||
ImGui::SliderFloat("Radius", &settings.radius, 1.f, 12.f);
|
||||
ImGui::SliderFloat("Intensity", &settings.intensity, 0.f, 1.f);
|
||||
ImGui::InputFloat("Radius", &settings.radius);
|
||||
ImGui::InputFloat("Intensity", &settings.intensity);
|
||||
}
|
||||
ImGui::PopID();
|
||||
};
|
||||
@@ -86,6 +86,12 @@ 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);
|
||||
if (m_canvas_glow.enabled)
|
||||
{
|
||||
ImGui::InputInt("Blur layers##canvas", &m_canvas_glow_layers);
|
||||
ImGui::InputFloat("Rounding##canvas", &m_canvas_glow_rounding);
|
||||
}
|
||||
}
|
||||
|
||||
if (ImGui::CollapsingHeader("Box", ImGuiTreeNodeFlags_DefaultOpen))
|
||||
@@ -231,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<float>{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)
|
||||
@@ -245,7 +289,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<Glow>
|
||||
{
|
||||
if (!settings.enabled)
|
||||
@@ -256,16 +299,9 @@ 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 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 auto canvas_glow = make_glow(m_canvas_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}}
|
||||
@@ -283,6 +319,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<omath::hud::ImguiHudRenderer>())
|
||||
.contents(
|
||||
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,
|
||||
@@ -290,7 +328,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,
|
||||
@@ -310,7 +348,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,
|
||||
@@ -320,7 +358,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,
|
||||
@@ -331,7 +369,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),
|
||||
@@ -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,
|
||||
|
||||
@@ -76,6 +76,9 @@ 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};
|
||||
int m_canvas_glow_layers = 64;
|
||||
float m_canvas_glow_rounding = 40.f;
|
||||
|
||||
// Skeleton
|
||||
omath::Color m_skel_color = omath::Color::from_rgba(255, 255, 255, 200);
|
||||
|
||||
@@ -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<widget::Glow>& 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<widget::Glow>& 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<widget::Glow>& 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<widget::Glow>& glow = std::nullopt);
|
||||
|
||||
@@ -184,6 +184,7 @@ namespace omath::hud
|
||||
EntityOverlay& add_snap_line(const Vector2<float>& start_pos, const Color& color, float width);
|
||||
|
||||
EntityOverlay& add_skeleton(const Color& color, float thickness = 1.f);
|
||||
EntityOverlay& add_skeleton(std::span<const widget::Bone> bones, const Color& color, float thickness = 1.f);
|
||||
|
||||
// ── Declarative interface ─────────────────────────────────────────
|
||||
/// Pass any combination of widget:: descriptor structs (and std::optional<W>
|
||||
@@ -248,6 +249,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,8 +270,11 @@ namespace omath::hud
|
||||
float thickness) const;
|
||||
void draw_glow_rectangle(const Vector2<float>& min, const Vector2<float>& max,
|
||||
const std::optional<widget::Glow>& glow) const;
|
||||
void draw_canvas_glow(const widget::CanvasGlow& canvas_glow) const;
|
||||
void draw_filled_rectangle(const Vector2<float>& min, const Vector2<float>& 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<float>& from, const Vector2<float>& to, const Color& color, float dash_len,
|
||||
float gap_len, float thickness) const;
|
||||
void draw_dashed_fill(const Vector2<float>& origin, const Vector2<float>& step_dir,
|
||||
|
||||
@@ -6,10 +6,14 @@
|
||||
#include "omath/linear_algebra/vector2.hpp"
|
||||
#include "omath/utility/color.hpp"
|
||||
#include <any>
|
||||
#include <array>
|
||||
#include <initializer_list>
|
||||
#include <optional>
|
||||
#include <span>
|
||||
#include <string_view>
|
||||
#include <type_traits>
|
||||
#include <variant>
|
||||
#include <vector>
|
||||
|
||||
namespace omath::hud::widget
|
||||
{
|
||||
@@ -23,6 +27,32 @@ namespace omath::hud::widget
|
||||
}
|
||||
};
|
||||
|
||||
struct BarGradient
|
||||
{
|
||||
Color empty_color;
|
||||
Color full_color;
|
||||
};
|
||||
|
||||
struct BarPaint : std::variant<Color, Gradient, BarGradient>
|
||||
{
|
||||
using std::variant<Color, Gradient, BarGradient>::variant;
|
||||
|
||||
constexpr BarPaint(const float red, const float green, const float blue, const float alpha)
|
||||
: std::variant<Color, Gradient, BarGradient>(Color{red, green, blue, alpha})
|
||||
{
|
||||
}
|
||||
|
||||
BarPaint(const Paint& paint)
|
||||
{
|
||||
std::visit(
|
||||
[this](const auto& value)
|
||||
{
|
||||
this->template emplace<std::decay_t<decltype(value)>>(value);
|
||||
},
|
||||
paint);
|
||||
}
|
||||
};
|
||||
|
||||
// ── Overloaded helper for std::visit ──────────────────────────────────────
|
||||
template<typename... Ts>
|
||||
struct Overloaded : Ts...
|
||||
@@ -39,6 +69,13 @@ namespace omath::hud::widget
|
||||
float intensity = 1.f;
|
||||
};
|
||||
|
||||
struct CanvasGlow
|
||||
{
|
||||
Glow glow;
|
||||
int layers = 64;
|
||||
float rounding = 20.f;
|
||||
};
|
||||
|
||||
// ── Standalone widgets ────────────────────────────────────────────────────
|
||||
struct Box
|
||||
{
|
||||
@@ -72,10 +109,37 @@ namespace omath::hud::widget
|
||||
float thickness = 1.f;
|
||||
};
|
||||
|
||||
struct Bone
|
||||
{
|
||||
Vector2<float> start;
|
||||
Vector2<float> end;
|
||||
};
|
||||
|
||||
struct Skeleton
|
||||
{
|
||||
std::vector<Bone> bones;
|
||||
Color color;
|
||||
float thickness = 1.f;
|
||||
|
||||
Skeleton(const Color& color, const float thickness = 1.f): color(color), thickness(thickness)
|
||||
{
|
||||
}
|
||||
|
||||
Skeleton(const std::span<const Bone> bones, const Color& color, const float thickness = 1.f)
|
||||
: bones(bones.begin(), bones.end()), color(color), thickness(thickness)
|
||||
{
|
||||
}
|
||||
|
||||
Skeleton(const std::initializer_list<Bone> bones, const Color& color, const float thickness = 1.f)
|
||||
: bones(bones), color(color), thickness(thickness)
|
||||
{
|
||||
}
|
||||
|
||||
template<std::size_t Size>
|
||||
Skeleton(const std::array<Bone, Size>& bones, const Color& color, const float thickness = 1.f)
|
||||
: Skeleton(std::span<const Bone>{bones}, color, thickness)
|
||||
{
|
||||
}
|
||||
};
|
||||
struct SnapLine
|
||||
{
|
||||
@@ -117,7 +181,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;
|
||||
|
||||
@@ -20,6 +20,12 @@ namespace omath::hud
|
||||
virtual void add_polyline(const std::span<const Vector2<float>>& vertexes, const Color& color,
|
||||
float thickness) = 0;
|
||||
|
||||
virtual void add_polyline_clipped(const std::span<const Vector2<float>>& vertexes, const Vector2<float>&,
|
||||
const Vector2<float>&, const Color& color, float thickness)
|
||||
{
|
||||
add_polyline(vertexes, color, thickness);
|
||||
}
|
||||
|
||||
virtual void add_filled_polyline(const std::span<const Vector2<float>>& vertexes, const Color& color) = 0;
|
||||
|
||||
virtual void add_rectangle(const Vector2<float>& min, const Vector2<float>& max, const Color& color) = 0;
|
||||
|
||||
@@ -15,6 +15,8 @@ namespace omath::hud
|
||||
float thickness) override;
|
||||
void add_polyline(const std::span<const Vector2<float>>& vertexes, const Color& color,
|
||||
float thickness) override;
|
||||
void add_polyline_clipped(const std::span<const Vector2<float>>& vertexes, const Vector2<float>& clip_min,
|
||||
const Vector2<float>& clip_max, const Color& color, float thickness) override;
|
||||
void add_filled_polyline(const std::span<const Vector2<float>>& vertexes, const Color& color) override;
|
||||
void add_rectangle(const Vector2<float>& min, const Vector2<float>& max, const Color& color) override;
|
||||
void add_filled_rectangle(const Vector2<float>& min, const Vector2<float>& max, const Color& color) override;
|
||||
|
||||
+128
-25
@@ -2,6 +2,7 @@
|
||||
// Created by orange on 13.03.2026.
|
||||
//
|
||||
#include "omath/hud/entity_overlay.hpp"
|
||||
#include <limits>
|
||||
|
||||
namespace omath::hud
|
||||
{
|
||||
@@ -76,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<widget::Glow>& glow)
|
||||
{
|
||||
@@ -84,18 +85,20 @@ 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<float>{m_text_cursor_right.x + offset, m_canvas.bottom_right_corner.y};
|
||||
m_renderer->add_filled_rectangle(bar_start, bar_start + Vector2<float>(width, -max_bar_height), bg_color);
|
||||
const auto bar_min = bar_start - Vector2<float>{0.f, max_bar_height};
|
||||
const auto bar_max = bar_start + Vector2<float>{width, 0.f};
|
||||
const auto fill_min = bar_start - Vector2<float>{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<float>(width, -max_bar_height * ratio), glow);
|
||||
draw_filled_rectangle(bar_start, bar_start + Vector2<float>(width, -max_bar_height * ratio), color);
|
||||
m_renderer->add_rectangle(bar_start - Vector2<float>(1.f, 0.f),
|
||||
bar_start + Vector2<float>(width, -max_bar_height), outline_color);
|
||||
draw_glow_rectangle(fill_min, bar_max, glow);
|
||||
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<widget::Glow>& glow)
|
||||
{
|
||||
@@ -103,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<float>{m_text_cursor_left.x - (offset + width), m_canvas.bottom_left_corner.y};
|
||||
m_renderer->add_filled_rectangle(bar_start, bar_start + Vector2<float>(width, -max_bar_height), bg_color);
|
||||
const auto bar_min = bar_start - Vector2<float>{0.f, max_bar_height};
|
||||
const auto bar_max = bar_start + Vector2<float>{width, 0.f};
|
||||
const auto fill_min = bar_start - Vector2<float>{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<float>(width, -max_bar_height * ratio), glow);
|
||||
draw_filled_rectangle(bar_start, bar_start + Vector2<float>(width, -max_bar_height * ratio), color);
|
||||
m_renderer->add_rectangle(bar_start - Vector2<float>(1.f, 0.f),
|
||||
bar_start + Vector2<float>(width, -max_bar_height), outline_color);
|
||||
draw_glow_rectangle(fill_min, bar_max, glow);
|
||||
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;
|
||||
|
||||
@@ -134,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<widget::Glow>& glow)
|
||||
{
|
||||
@@ -142,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<float>{m_canvas.top_left_corner.x, m_text_cursor_top.y - offset};
|
||||
m_renderer->add_filled_rectangle(bar_start, bar_start + Vector2<float>(max_bar_width, -height), bg_color);
|
||||
const auto bar_min = bar_start - Vector2<float>{0.f, height};
|
||||
const auto bar_max = bar_start + Vector2<float>{max_bar_width, 0.f};
|
||||
const auto fill_max = Vector2<float>{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<float>(max_bar_width * ratio, -height), glow);
|
||||
draw_filled_rectangle(bar_start, bar_start + Vector2<float>(max_bar_width * ratio, -height), color);
|
||||
m_renderer->add_rectangle(bar_start, bar_start + Vector2<float>(max_bar_width, -height), outline_color);
|
||||
draw_glow_rectangle(bar_min, fill_max, glow);
|
||||
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;
|
||||
|
||||
@@ -329,6 +337,14 @@ namespace omath::hud
|
||||
return *this;
|
||||
}
|
||||
|
||||
EntityOverlay& EntityOverlay::add_skeleton(const std::span<const widget::Bone> 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<float>& from, const Vector2<float>& to, const Color& color,
|
||||
const float dash_len, const float gap_len, const float thickness) const
|
||||
{
|
||||
@@ -388,7 +404,7 @@ namespace omath::hud
|
||||
const int radius = static_cast<int>(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<float>(layer - 1) / static_cast<float>(radius + 1));
|
||||
const auto value = glow->color.value();
|
||||
const Color color{value.x, value.y, value.z, alpha / static_cast<float>(radius)};
|
||||
@@ -442,7 +458,7 @@ namespace omath::hud
|
||||
{
|
||||
const float falloff = 1.f - static_cast<float>(layer - 1) / static_cast<float>(radius + 1);
|
||||
const Color color{value.x, value.y, value.z,
|
||||
value.w * std::clamp(glow.intensity, 0.f, 1.f) * falloff / static_cast<float>(radius)};
|
||||
value.w * std::max(glow.intensity, 0.f) * falloff / static_cast<float>(radius)};
|
||||
m_renderer->add_polyline(points, color, thickness + static_cast<float>(layer) * 2.f);
|
||||
}
|
||||
}
|
||||
@@ -456,7 +472,7 @@ namespace omath::hud
|
||||
{
|
||||
const float falloff = 1.f - static_cast<float>(layer - 1) / static_cast<float>(radius + 1);
|
||||
const Color color{value.x, value.y, value.z,
|
||||
value.w * std::clamp(glow.intensity, 0.f, 1.f) * falloff / static_cast<float>(radius)};
|
||||
value.w * std::max(glow.intensity, 0.f) * falloff / static_cast<float>(radius)};
|
||||
m_renderer->add_line(from, to, color, thickness + static_cast<float>(layer) * 2.f);
|
||||
}
|
||||
}
|
||||
@@ -476,6 +492,56 @@ namespace omath::hud
|
||||
draw_glow_polyline(points, *glow, 1.f);
|
||||
}
|
||||
|
||||
void EntityOverlay::draw_canvas_glow(const widget::CanvasGlow& canvas_glow) const
|
||||
{
|
||||
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);
|
||||
|
||||
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<float>(layers - 1) * 2.f, 1.f);
|
||||
for (int layer = 0; layer < layers; ++layer)
|
||||
{
|
||||
const float progress = static_cast<float>(layer) / static_cast<float>(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<float>{expansion, expansion};
|
||||
const auto expanded_max = max + Vector2<float>{expansion, expansion};
|
||||
const float expanded_rounding = rounding + expansion;
|
||||
const std::array corner_centers = {
|
||||
expanded_min + Vector2<float>{expanded_rounding, expanded_rounding},
|
||||
Vector2<float>{expanded_max.x - expanded_rounding, expanded_min.y + expanded_rounding},
|
||||
expanded_max - Vector2<float>{expanded_rounding, expanded_rounding},
|
||||
Vector2<float>{expanded_min.x + expanded_rounding, expanded_max.y - expanded_rounding},
|
||||
};
|
||||
std::array<Vector2<float>, corner_segments * 4> points;
|
||||
for (int corner = 0; corner < 4; ++corner)
|
||||
{
|
||||
const float start_angle =
|
||||
std::numbers::pi_v<float> + static_cast<float>(corner) * std::numbers::pi_v<float> * 0.5f;
|
||||
for (int segment = 0; segment < corner_segments; ++segment)
|
||||
{
|
||||
const float arc_progress = static_cast<float>(segment) / static_cast<float>(corner_segments - 1);
|
||||
const float angle = start_angle + arc_progress * std::numbers::pi_v<float> * 0.5f;
|
||||
points[corner * corner_segments + segment] =
|
||||
corner_centers[corner]
|
||||
+ Vector2<float>{std::cos(angle) * expanded_rounding, std::sin(angle) * expanded_rounding};
|
||||
}
|
||||
}
|
||||
constexpr float clip_extent = std::numeric_limits<float>::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);
|
||||
}
|
||||
}
|
||||
|
||||
void EntityOverlay::draw_filled_rectangle(const Vector2<float>& min, const Vector2<float>& max,
|
||||
const widget::Paint& paint) const
|
||||
{
|
||||
@@ -494,7 +560,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<widget::Glow>& glow)
|
||||
{
|
||||
@@ -502,10 +594,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<float>{m_canvas.bottom_left_corner.x, m_text_cursor_bottom.y + offset};
|
||||
m_renderer->add_filled_rectangle(bar_start, bar_start + Vector2<float>(max_bar_width, height), bg_color);
|
||||
draw_glow_rectangle(bar_start, bar_start + Vector2<float>(max_bar_width * ratio, height), glow);
|
||||
draw_filled_rectangle(bar_start, bar_start + Vector2<float>(max_bar_width * ratio, height), color);
|
||||
m_renderer->add_rectangle(bar_start, bar_start + Vector2<float>(max_bar_width, height), outline_color);
|
||||
const auto bar_min = bar_start;
|
||||
const auto bar_max = bar_start + Vector2<float>{max_bar_width, height};
|
||||
const auto fill_max = bar_start + Vector2<float>{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, resolve_bar_paint(color, ratio, false));
|
||||
m_renderer->add_rectangle(bar_min, bar_max, outline_color);
|
||||
|
||||
m_text_cursor_bottom.y += offset + height;
|
||||
|
||||
@@ -726,6 +821,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)
|
||||
@@ -756,7 +856,10 @@ namespace omath::hud
|
||||
|
||||
void EntityOverlay::dispatch(const widget::Skeleton& skeleton)
|
||||
{
|
||||
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)
|
||||
|
||||
@@ -27,6 +27,17 @@ namespace omath::hud
|
||||
ImDrawFlags_Closed, thickness);
|
||||
}
|
||||
|
||||
void ImguiHudRenderer::add_polyline_clipped(const std::span<const Vector2<float>>& vertexes,
|
||||
const Vector2<float>& clip_min, const Vector2<float>& 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<const ImVec2*>(vertexes.data()), static_cast<int>(vertexes.size()),
|
||||
color.to_im_color(), ImDrawFlags_Closed, thickness);
|
||||
draw_list->PopClipRect();
|
||||
}
|
||||
|
||||
void ImguiHudRenderer::add_filled_polyline(const std::span<const Vector2<float>>& vertexes, const Color& color)
|
||||
{
|
||||
ImGui::GetBackgroundDrawList()->AddConvexPolyFilled(reinterpret_cast<const ImVec2*>(vertexes.data()),
|
||||
|
||||
Reference in New Issue
Block a user