X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fgraphics%2Frender.cpp;h=be59d2357befaa1eae6481008e8852d8ae64617d;hb=54deb92306a3de4fc1ee17fb7081a8b92f16ddda;hp=747bfa2dbee75a01d88e14bf55255f15007289c5;hpb=3f35e70a6b66daf2ffd59590e98e2dd11e6eaabb;p=blank.git

diff --git a/src/graphics/render.cpp b/src/graphics/render.cpp
index 747bfa2..be59d23 100644
--- a/src/graphics/render.cpp
+++ b/src/graphics/render.cpp
@@ -1,9 +1,6 @@
 #include "BlendedSprite.hpp"
-#include "FixedText.hpp"
 #include "Font.hpp"
 #include "Format.hpp"
-#include "MessageBox.hpp"
-#include "Text.hpp"
 #include "Texture.hpp"
 #include "Viewport.hpp"
 
@@ -104,8 +101,8 @@ bool Font::HasGlyph(Uint16 c) const noexcept {
 }
 
 
-glm::tvec2<int> Font::TextSize(const char *text) const {
-	glm::tvec2<int> size;
+glm::ivec2 Font::TextSize(const char *text) const {
+	glm::ivec2 size;
 	if (TTF_SizeUTF8(handle, text, &size.x, &size.y) != 0) {
 		throw std::runtime_error(TTF_GetError());
 	}
@@ -160,104 +157,6 @@ void Format::ReadPixelFormat(const SDL_PixelFormat &fmt) {
 }
 
 
-MessageBox::MessageBox(const Font &f)
-: font(f)
-, lines()
-, max_lines(10)
-, pos(0.0f)
-, adv(0.0f, font.LineSkip(), 0.0f)
-, bg(1.0f, 1.0f, 1.0f, 0.0f)
-, fg(1.0f, 1.0f, 1.0f, 1.0f)
-, grav(Gravity::NORTH_WEST) {
-
-}
-
-void MessageBox::Position(const glm::vec3 &p, Gravity g) noexcept {
-	pos = p;
-	grav = g;
-	if (get_y(g) == Align::END) {
-		adv.y = -font.LineSkip();
-	} else {
-		adv.y = font.LineSkip();
-	}
-	for (Text &txt : lines) {
-		txt.Pivot(g);
-	}
-}
-
-void MessageBox::PushLine(const char *text) {
-	lines.emplace_front();
-	Text &txt = lines.front();
-	txt.Set(font, text);
-	txt.Pivot(grav);
-
-	while (lines.size() > max_lines) {
-		lines.pop_back();
-	}
-}
-
-void MessageBox::Render(Viewport &viewport) noexcept {
-	BlendedSprite &prog = viewport.SpriteProgram();
-	prog.SetBG(bg);
-	prog.SetFG(fg);
-	viewport.SetCursor(pos, grav);
-	for (Text &txt : lines) {
-		prog.SetM(viewport.Cursor());
-		txt.Render(viewport);
-		viewport.MoveCursor(adv);
-	}
-}
-
-
-Text::Text() noexcept
-: tex()
-, sprite()
-, size(0.0f)
-, pivot(Gravity::NORTH_WEST)
-, dirty(false) {
-
-}
-
-FixedText::FixedText() noexcept
-: Text()
-, bg(1.0f, 1.0f, 1.0f, 0.0f)
-, fg(1.0f, 1.0f, 1.0f, 1.0f)
-, pos(0.0f)
-, grav(Gravity::NORTH_WEST)
-, visible(false) {
-
-}
-
-void Text::Set(const Font &font, const char *text) {
-	font.Render(text, tex);
-	size = font.TextSize(text);
-	dirty = true;
-}
-
-void Text::Update() {
-	sprite.LoadRect(size.x, size.y, align(pivot, size));
-	dirty = false;
-}
-
-void FixedText::Render(Viewport &viewport) noexcept {
-	BlendedSprite &prog = viewport.SpriteProgram();
-	viewport.SetCursor(pos, grav);
-	prog.SetM(viewport.Cursor());
-	prog.SetBG(bg);
-	prog.SetFG(fg);
-	Text::Render(viewport);
-}
-
-void Text::Render(Viewport &viewport) noexcept {
-	if (dirty) {
-		Update();
-	}
-	BlendedSprite &prog = viewport.SpriteProgram();
-	prog.SetTexture(tex);
-	sprite.Draw();
-}
-
-
 Texture::Texture()
 : handle(0)
 , width(0)