oneechanhax/libglez
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 4 Wiki Activity

Refactor and deconstruct fix

Browse Source 
(memory leak if not shutdown correctly)
This commit is contained in:
TotallyNotElite 2018-12-18 21:52:07 +01:00
parent dd0158bcb3
commit ac817c1c55
6 changed files with 30 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/glez/detail/font.hpp
View File

@ -12,7 +12,7 @@
namespace glez::detail::font namespace glez::detail::font
{ {
struct font struct ifont
{ {
void load(const std::string &path, float size); void load(const std::string &path, float size);
void unload(); void unload();
@ -20,7 +20,7 @@ struct font
bool init{ false }; bool init{ false };
texture_font_t *font{ nullptr }; texture_font_t *m_font{ nullptr };
texture_atlas_t *atlas{ nullptr }; texture_atlas_t *atlas{ nullptr };
}; };
@ -28,5 +28,5 @@ void init();
void shutdown(); void shutdown();
unsigned create(); unsigned create();
font &get(unsigned handle); ifont &get(unsigned handle);
} // namespace glez::detail::font } // namespace glez::detail::font

35
src/detail/font.cpp
View File

@ -8,59 +8,60 @@
#include <memory> #include <memory>
#include <cassert> #include <cassert>
static std::unique_ptr<std::vector<glez::detail::font::font>> cache{ nullptr };
namespace glez::detail::font namespace glez::detail::font
{ {
std::vector<glez::detail::font::ifont> *cache = nullptr;
void init() void init()
{ {
cache = std::make_unique<std::vector<font>>(); cache = new std::vector<glez::detail::font::ifont>;
} }
void shutdown() void shutdown()
{ {
cache.reset(nullptr); delete cache;
} }
void font::load(const std::string &path, float size) void ifont::load(const std::string &path, float size)
{ {
assert(size > 0); assert(size > 0);
atlas = texture_atlas_new(1024, 1024, 1); atlas = texture_atlas_new(1024, 1024, 1);
assert(atlas != nullptr); assert(atlas != nullptr);
font = texture_font_new_from_file(atlas, size, path.c_str()); m_font = texture_font_new_from_file(atlas, size, path.c_str());
assert(font != nullptr); assert(m_font != nullptr);
init = true; init = true;
} }
void font::unload() void ifont::unload()
{ {
if (!init) if (!init)
return; return;
texture_atlas_delete(atlas); if (atlas)
if (font) texture_atlas_delete(atlas);
texture_font_delete(font); if (m_font)
texture_font_delete(m_font);
init = false; init = false;
} }
void font::stringSize(const std::string &string, float *width, float *height) void ifont::stringSize(const std::string &string, float *width, float *height)
{ {
float penX = 0; float penX = 0;
float size_x = 0; float size_x = 0;
float size_y = 0; float size_y = 0;
texture_font_load_glyphs(font, string.c_str()); texture_font_load_glyphs(m_font, string.c_str());
const char *sstring = string.c_str(); const char *sstring = string.c_str();
for (size_t i = 0; i < string.size(); ++i) for (size_t i = 0; i < string.size(); ++i)
{ {
// c_str guarantees a NULL terminator // c_str guarantees a NULL terminator
texture_glyph_t *glyph = texture_font_find_glyph(font, &sstring[i]); texture_glyph_t *glyph = texture_font_find_glyph(m_font, &sstring[i]);
if (glyph == nullptr) if (glyph == nullptr)
continue; continue;
@ -85,12 +86,12 @@ unsigned create()
if (not(*cache)[i].init) if (not(*cache)[i].init)
return i; return i;
auto result = cache->size(); auto result = cache->size();
cache->push_back(font{}); cache->push_back(ifont{});
return result; return result;
} }
font &get(unsigned handle) ifont &get(unsigned handle)
{ {
return (*cache)[handle]; return cache->at(handle);
} }
} // namespace glez::detail::font } // namespace glez::detail::font

8
src/detail/texture.cpp
View File

@ -12,21 +12,19 @@
#include <fstream> // required to load the file #include <fstream> // required to load the file
static std::unique_ptr<std::vector<glez::detail::texture::texture>> cache{ static std::vector<glez::detail::texture::texture> *cache{ nullptr };
nullptr
};
namespace glez::detail::texture namespace glez::detail::texture
{ {
void init() void init()
{ {
cache = std::make_unique<std::vector<texture>>(); cache = new std::vector<glez::detail::texture::texture>();
} }
void shutdown() void shutdown()
{ {
cache.reset(nullptr); delete cache;
} }
void texture::bind() void texture::bind()

4
src/draw.cpp
View File

@ -233,7 +233,7 @@ void string(float x, float y, const std::string &string, font &font, rgba color,
if (!font.isLoaded()) if (!font.isLoaded())
font.load(); font.load();
auto fnt = glez::detail::font::get(font.getHandle()).font; auto fnt = glez::detail::font::get(font.getHandle()).m_font;
fnt->rendermode = RENDER_NORMAL; fnt->rendermode = RENDER_NORMAL;
fnt->outline_thickness = 0.0f; fnt->outline_thickness = 0.0f;
internal_draw_string(x, y, string, fnt, color, width, height); internal_draw_string(x, y, string, fnt, color, width, height);
@ -245,7 +245,7 @@ void outlined_string(float x, float y, const std::string &string, font &font,
if (!font.isLoaded()) if (!font.isLoaded())
font.load(); font.load();
auto fnt = glez::detail::font::get(font.getHandle()).font; auto fnt = glez::detail::font::get(font.getHandle()).m_font;
fnt->rendermode = RENDER_OUTLINE_POSITIVE; fnt->rendermode = RENDER_OUTLINE_POSITIVE;
fnt->outline_thickness = 1.0f; fnt->outline_thickness = 1.0f;
internal_draw_string(x, y, string, fnt, outline, width, height); internal_draw_string(x, y, string, fnt, outline, width, height);