X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fgraphics%2Frender.cpp;h=2b227422a48cb3b950390d73cf152350fcf7f716;hb=376fc1fca87fcdd22dabadf6d01d245ef8c3cedd;hp=3d0bbd47c6cf2e00feb6efb10798c22469a694a8;hpb=282d731ea8f10342efa82012028de7043b3dd639;p=blank.git

diff --git a/src/graphics/render.cpp b/src/graphics/render.cpp
index 3d0bbd4..2b22742 100644
--- a/src/graphics/render.cpp
+++ b/src/graphics/render.cpp
@@ -1,6 +1,8 @@
+#include "BlendedSprite.hpp"
 #include "Font.hpp"
 #include "Format.hpp"
 #include "Texture.hpp"
+#include "Viewport.hpp"
 
 #include <algorithm>
 #include <cstring>
@@ -34,6 +36,31 @@ Font &Font::operator =(Font &&other) noexcept {
 }
 
 
+int Font::Style() const noexcept {
+	return TTF_GetFontStyle(handle);
+}
+
+void Font::Style(int s) const noexcept {
+	TTF_SetFontStyle(handle, s);
+}
+
+int Font::Outline() const noexcept {
+	return TTF_GetFontOutline(handle);
+}
+
+void Font::Outline(int px) noexcept {
+	TTF_SetFontOutline(handle, px);
+}
+
+
+int Font::Hinting() const noexcept {
+	return TTF_GetFontHinting(handle);
+}
+
+void Font::Hinting(int h) const noexcept {
+	TTF_SetFontHinting(handle, h);
+}
+
 bool Font::Kerning() const noexcept {
 	return TTF_GetFontKerning(handle);
 }
@@ -60,6 +87,15 @@ int Font::LineSkip() const noexcept {
 }
 
 
+const char *Font::FamilyName() const noexcept {
+	return TTF_FontFaceFamilyName(handle);
+}
+
+const char *Font::StyleName() const noexcept {
+	return TTF_FontFaceStyleName(handle);
+}
+
+
 bool Font::HasGlyph(Uint16 c) const noexcept {
 	return TTF_GlyphIsProvided(handle, c);
 }
@@ -73,17 +109,21 @@ glm::tvec2<int> Font::TextSize(const char *text) const {
 	return size;
 }
 
-Texture Font::Render(const char *text, SDL_Color color) const {
-	SDL_Surface *srf = TTF_RenderUTF8_Blended(handle, text, color);
+Texture Font::Render(const char *text) const {
+	Texture tex;
+	Render(text, tex);
+	return tex;
+}
+
+void Font::Render(const char *text, Texture &tex) const {
+	SDL_Surface *srf = TTF_RenderUTF8_Blended(handle, text, { 0xFF, 0xFF, 0xFF, 0xFF });
 	if (!srf) {
 		throw std::runtime_error(TTF_GetError());
 	}
-	Texture tex;
 	tex.Bind();
 	tex.Data(*srf, false);
 	tex.FilterLinear();
 	SDL_FreeSurface(srf);
-	return tex;
 }