tobid7/renderd7
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update Font System

Browse Source
This commit is contained in:
tobid7
2024-05-19 11:35:59 +02:00
parent a1de7e9d13
commit a9600f8d02
4 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/renderd7/DrawV2.hpp
View File

@ -48,7 +48,7 @@ std::string TextShort(const std::string& in, int max_len);
// Overrite TextBox Size (by default Screenwidth x Text.h)
void TextMaxBox(R7Vec2 size);
void TextDefaultBox();
void TextFont(Font fnt);
void TextFont(Font::Ref fnt);
void TextDefaultFont();
namespace Draw2 {
void Rect(R7Vec2 pos, R7Vec2 size, unsigned int color, int t = 1);

16
include/renderd7/font.hpp
View File

@ -21,15 +21,21 @@
#include <citro2d.h>
#include <fstream>
#include <memory>
#include <renderd7/Error.hpp>
namespace RenderD7 {
class Font {
public:
Font() = default;
Font(const std::string& path) { load(path); };
~Font() { unload(); }
void load(const std::string& path) {
Font(const std::string& path) { Load(path); };
~Font() { Unload(); }
using Ref = std::shared_ptr<Font>;
template<typename ...args>
inline static Ref New(args &&...a) {
return std::make_shared<Font>(std::forward<args>(a)...);
}
void Load(const std::string& path) {
std::ifstream ft(path, std::ios::in | std::ios::binary);
bool io = ft.is_open();
ft.close();
@ -37,8 +43,8 @@ class Font {
fnt = C2D_FontLoad(path.c_str());
RenderD7::InlineAssert(fnt, "Font could not be loaded!");
}
C2D_Font ptr() { return fnt; }
void unload() {
C2D_Font Ptr() { return fnt; }
void Unload() {
if (!fnt) return;
C2D_FontFree(fnt);
fnt = nullptr;