X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fui%2Fwidgets.cpp;h=b0d44e20969fa23a55bbfe589e76d4b0fa3332be;hb=475f28f06c9e14912bab8119264e247ef466513d;hp=fb2ef74922d578595a06b976c76516e0ffe233ed;hpb=ab817024b3c02a54a376fa8f60b5046e51128ebb;p=blobs.git diff --git a/src/ui/widgets.cpp b/src/ui/widgets.cpp index fb2ef74..b0d44e2 100644 --- a/src/ui/widgets.cpp +++ b/src/ui/widgets.cpp @@ -7,6 +7,8 @@ #include "../graphics/Font.hpp" #include "../graphics/Viewport.hpp" +#include +#include #include @@ -33,6 +35,61 @@ Label *Label::Text(const std::string &t) { return this; } +Label *Label::Decimal(double n, int prec) { + std::stringstream s; + s << std::fixed << std::setprecision(prec) << n; + return Text(s.str()); +} + +Label *Label::Length(double m) { + std::stringstream s; + s << std::fixed << std::setprecision(3); + if (m > 1500.0) { + s << (m * 0.001) << "km"; + } else if (m < 0.1) { + s << (m * 1000.0) << "mm"; + } else { + s << m << "m"; + } + return Text(s.str()); +} + +Label *Label::Mass(double kg) { + std::stringstream s; + s << std::fixed << std::setprecision(3); + if (kg > 1500.0) { + s << (kg * 0.001) << "t"; + } else if (kg < 0.1) { + s << (kg * 1000.0) << "g"; + } else if (kg < 0.0001) { + s << (kg * 1.0e6) << "mg"; + } else { + s << kg << "kg"; + } + return Text(s.str()); +} + +Label *Label::Percentage(double n) { + std::stringstream s; + s << std::fixed << std::setprecision(1) << (n * 100.0) << '%'; + return Text(s.str()); +} + +Label *Label::Time(double s) { + int is = int(s); + std::stringstream ss; + if (is >= 3600) { + ss << (is / 3600) << "h "; + is %= 3600; + } + if (is >= 60) { + ss << (is / 60) << "m "; + is %= 60; + } + ss << is << 's'; + return Text(ss.str()); +} + Label *Label::Font(const graphics::Font &f) { if (font != &f) { dirty = true; @@ -60,11 +117,12 @@ glm::vec2 Label::Size() { } void Label::Draw(app::Assets &assets, graphics::Viewport &viewport) noexcept { + if (text.empty()) return; Update(); glm::vec2 size = Size(); assets.shaders.alpha_sprite.Activate(); - assets.shaders.alpha_sprite.SetM(glm::translate(AlignedPosition()) + assets.shaders.alpha_sprite.SetM(glm::translate(glm::vec3(Position() + (size * 0.5f), -ZIndex())) * glm::scale(glm::vec3(size.x, size.y, 1.0f))); assets.shaders.alpha_sprite.SetTexture(tex); assets.shaders.alpha_sprite.SetFgColor(fg_color); @@ -73,7 +131,7 @@ void Label::Draw(app::Assets &assets, graphics::Viewport &viewport) noexcept { } void Label::Update() { - if (!dirty) return; + if (!dirty || text.empty()) return; font->Render(text, tex); dirty = false; } @@ -92,28 +150,31 @@ Meter::~Meter() { } glm::vec2 Meter::Size() { - return size + (2.0f * padding) + (2.0f * border); + return size + (2.0f * padding) + glm::vec2(2.0f * border); } void Meter::Draw(app::Assets &assets, graphics::Viewport &viewport) noexcept { glm::vec2 fullsize = Size(); - assets.shaders.plain_color.Activate(); + assets.shaders.canvas.Activate(); + assets.shaders.canvas.ZIndex(ZIndex()); if (border > 0.0f) { - assets.shaders.plain_color.SetM(glm::translate(AlignedPosition()) - * glm::scale(glm::vec3(fullsize.x, fullsize.y, 1.0f))); - assets.shaders.plain_color.SetColor(border_color); - assets.shaders.plain_color.OutlineRect(); + assets.shaders.canvas.SetColor(border_color); + assets.shaders.canvas.DrawRect( + Position() + glm::vec2(border * 0.5f), + Position() + fullsize - glm::vec2(border * 0.5f), + border + ); } if (value > 0.0f) { - glm::vec3 top_left(glm::vec2(TopLeft()) + padding + glm::vec2(border), Position().z); - glm::vec2 actual_size(size.x * value, size.y); - - assets.shaders.plain_color.SetM(glm::translate(align(Gravity::NORTH_WEST, actual_size, top_left)) - * glm::scale(glm::vec3(actual_size, 1.0f))); - assets.shaders.plain_color.SetColor(fill_color); - assets.shaders.plain_color.DrawRect(); + glm::vec2 bottom_right = Position() + fullsize - glm::vec2(border) - padding; + bottom_right.x -= size.x * (1.0f - value); + assets.shaders.canvas.SetColor(fill_color); + assets.shaders.canvas.FillRect( + Position() + glm::vec2(border) + padding, + bottom_right + ); } } @@ -167,15 +228,17 @@ Panel *Panel::Spacing(float s) { Panel *Panel::Direction(Dir d) { dir = d; - Relayout(); + Layout(); return this; } glm::vec2 Panel::Size() { - return (2.0f * padding) + glm::vec2(0.0f, (widgets.size() - 1) * spacing) + size; + glm::vec2 space(0.0f); + space[dir] = (widgets.size() - 1) * spacing; + return (2.0f * padding) + space + size; } -void Panel::Relayout() { +void Panel::Layout() { size = glm::vec2(0.0f); if (dir == HORIZONTAL) { for (auto &w : widgets) { @@ -193,21 +256,18 @@ void Panel::Relayout() { } void Panel::Draw(app::Assets &assets, graphics::Viewport &viewport) noexcept { + // TODO: separate draw and layout, it's inefficient and the wrong tree order anyway + Layout(); if (bg_color.a > 0.0f) { - glm::vec2 fullsize = Size(); - assets.shaders.plain_color.Activate(); - assets.shaders.plain_color.SetM(glm::translate(AlignedPosition()) - * glm::scale(glm::vec3(fullsize.x, fullsize.y, 1.0f))); - assets.shaders.plain_color.SetColor(bg_color); - assets.shaders.plain_color.DrawRect(); + assets.shaders.canvas.Activate(); + assets.shaders.canvas.ZIndex(ZIndex()); + assets.shaders.canvas.SetColor(bg_color); + assets.shaders.canvas.FillRect(Position(), Position() + Size()); } - glm::vec3 cursor = TopLeft(); - cursor.x += padding.x; - cursor.y += padding.y; - cursor.z -= 1.0f; + glm::vec2 cursor = Position() + padding; for (auto &w : widgets) { - w->Position(cursor)->Origin(Gravity::NORTH_WEST); + w->Position(cursor)->ZIndex(ZIndex() + 1.0f); w->Draw(assets, viewport); cursor[dir] += w->Size()[dir] + spacing; } @@ -216,20 +276,11 @@ void Panel::Draw(app::Assets &assets, graphics::Viewport &viewport) noexcept { Widget::Widget() : pos(0.0f) -, origin(Gravity::CENTER) { +, z_index(1.0f) { } Widget::~Widget() { } -glm::vec3 Widget::AlignedPosition() noexcept { - return align(origin, Size(), pos); -} - -glm::vec3 Widget::TopLeft() noexcept { - glm::vec2 size = Size(); - return align(origin, size, pos) - glm::vec3(size * 0.5f, 0.0f); -} - } }