X-Git-Url: https://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fui%2Fwidgets.cpp;h=49fdb69ff9048e0249b2a6621e75c724136b677b;hb=c51b3bbef5c9b8ab52f55d46f08c5992fe574f70;hp=94c4182ec0c1911aecba6a56b58811ce61a3901e;hpb=56f570e713c42d30109a214e68a2beed96ba1999;p=blobs.git

diff --git a/src/ui/widgets.cpp b/src/ui/widgets.cpp
index 94c4182..49fdb69 100644
--- a/src/ui/widgets.cpp
+++ b/src/ui/widgets.cpp
@@ -1,4 +1,5 @@
 #include "Label.hpp"
+#include "Meter.hpp"
 #include "Panel.hpp"
 #include "Widget.hpp"
 
@@ -24,30 +25,30 @@ Label::Label(const graphics::Font &f)
 Label::~Label() {
 }
 
-Label &Label::Text(const std::string &t) {
+Label *Label::Text(const std::string &t) {
 	if (text != t) {
 		dirty = true;
 	}
 	text = t;
-	return *this;
+	return this;
 }
 
-Label &Label::Font(const graphics::Font &f) {
+Label *Label::Font(const graphics::Font &f) {
 	if (font != &f) {
 		dirty = true;
 	}
 	font = &f;
-	return *this;
+	return this;
 }
 
-Label &Label::Foreground(const glm::vec4 &c) {
+Label *Label::Foreground(const glm::vec4 &c) {
 	fg_color = c;
-	return *this;
+	return this;
 }
 
-Label &Label::Background(const glm::vec4 &c) {
+Label *Label::Background(const glm::vec4 &c) {
 	bg_color = c;
-	return *this;
+	return this;
 }
 
 glm::vec2 Label::Size() {
@@ -63,7 +64,7 @@ void Label::Draw(app::Assets &assets, graphics::Viewport &viewport) noexcept {
 	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);
@@ -78,6 +79,48 @@ void Label::Update() {
 }
 
 
+Meter::Meter()
+: fill_color(1.0f)
+, border_color(1.0f)
+, size(3.0f)
+, padding(1.0f)
+, border(1.0f)
+, value(0.0f) {
+}
+
+Meter::~Meter() {
+}
+
+glm::vec2 Meter::Size() {
+	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.canvas.Activate();
+	assets.shaders.canvas.ZIndex(ZIndex());
+
+	if (border > 0.0f) {
+		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::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
+		);
+	}
+}
+
+
 Panel::Panel()
 : widgets()
 , bg_color(0.0f, 0.0f, 0.0f, 0.0f)
@@ -90,7 +133,7 @@ Panel::Panel()
 Panel::~Panel() {
 }
 
-Panel &Panel::Add(Widget *w) {
+Panel *Panel::Add(Widget *w) {
 	std::unique_ptr<Widget> widget(w);
 	glm::vec2 wsize = widget->Size();
 	if (dir == HORIZONTAL) {
@@ -101,32 +144,38 @@ Panel &Panel::Add(Widget *w) {
 		size.y += wsize.y;
 	}
 	widgets.emplace_back(std::move(widget));
-	return *this;
+	return this;
+}
+
+Panel *Panel::Clear() {
+	widgets.clear();
+	size = glm::vec2(0.0f);
+	return this;
 }
 
-Panel &Panel::Background(const glm::vec4 &c) {
+Panel *Panel::Background(const glm::vec4 &c) {
 	bg_color = c;
-	return *this;
+	return this;
 }
 
-Panel &Panel::Padding(const glm::vec2 &p) {
+Panel *Panel::Padding(const glm::vec2 &p) {
 	padding = p;
-	return *this;
+	return this;
 }
 
-Panel &Panel::Spacing(float s) {
+Panel *Panel::Spacing(float s) {
 	spacing = s;
-	return *this;
+	return this;
 }
 
-Panel &Panel::Direction(Dir d) {
+Panel *Panel::Direction(Dir d) {
 	dir = d;
 	Relayout();
-	return *this;
+	return this;
 }
 
 glm::vec2 Panel::Size() {
-	return 2.0f * padding + glm::vec2(0.0f, (widgets.size() - 1) * spacing) + size;
+	return (2.0f * padding) + glm::vec2(0.0f, (widgets.size() - 1) * spacing) + size;
 }
 
 void Panel::Relayout() {
@@ -148,20 +197,17 @@ void Panel::Relayout() {
 
 void Panel::Draw(app::Assets &assets, graphics::Viewport &viewport) noexcept {
 	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();
+	glm::vec2 cursor = Position();
 	cursor.x += padding.x;
 	cursor.y += padding.y;
-	cursor.z -= 1.0f;
 	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;
 	}
@@ -170,20 +216,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);
-}
-
 }
 }