corentin/uui
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix text rendering

Browse source
This commit is contained in:
Corentin 2021-07-13 00:35:45 +09:00
commit 1a200205a5
12 changed files with 214 additions and 68 deletions
Download patch file Download diff file Expand all files Collapse all files

5
include/uui/opengl/application.hpp
View file

@ -64,7 +64,8 @@ protected:
int width;
int height;
bool need_resize_refresh;
bool render_needed;
bool resize_needed;
bool iconified;
@ -79,7 +80,7 @@ protected:
void init();
void deinit();
void draw();
void render();
static void glfw_resize_callback(GLFWwindow* window, int width, int height);
static void glfw_iconify_callback(GLFWwindow* window, int iconified);

4
include/uui/opengl/font_manager.hpp
View file

@ -35,7 +35,7 @@ public:
struct Font
{
character_info char_infos[256];
GLuint tex;
GLuint atlas_texture;
unsigned int atlas_width;
unsigned int atlas_height;
};
@ -51,7 +51,7 @@ public:
std::tuple<int, int> get_text_size(const std::string& text, Font& font, float scale_x, float scale_y);
private:
static constexpr int MAX_WIDTH = 1024;
static constexpr int ATLAS_MAX_WIDTH = 1024;
bool initialized;

2
include/uui/opengl/label.hpp
View file

@ -18,7 +18,7 @@ class GlLabel: public GlComponent
protected:
std::string text;
const std::tuple<float, float, float, float>& text_color;
std::tuple<float, float, float, float> text_color;
int text_width;
int text_height;