summaryrefslogtreecommitdiff
path: root/src/font.hpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/font.hpp')
-rw-r--r--src/font.hpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/font.hpp b/src/font.hpp
index 494c365..116ac06 100644
--- a/src/font.hpp
+++ b/src/font.hpp
@@ -6,8 +6,6 @@
#include "pk.h"
#include <glm/vec4.hpp>
-#include <ostream>
-#include <istream>
/*
Vert: (two triangles)
@@ -47,7 +45,9 @@ struct FontType : public Entity_Base {
VkImageView textureImageView = VK_NULL_HANDLE;
VkDescriptorPool vkDescriptorPool = VK_NULL_HANDLE;
VkDescriptorSet *vkDescriptorSets = nullptr;
+ FontGlyphChar *glyphs;
FontRender *renders = nullptr;
+ uint32_t n_glyphs;
FontRenderIndex n_render = FontRenderIndex{0};
FontRenderIndex h_render = FontRenderIndex{0};
FontTypeIndex index_ft = FontTypeIndex{0};
@@ -64,10 +64,11 @@ struct FontType : public Entity_Base {
void FontType_Init();
void FontType_Teardown();
+void FontType_Tick();
void FontType_Serialize(std::ofstream &stream, FontType *ft);
void FontType_Deserialize(std::ifstream &stream);
FontType* FontType_GetFonts(FontTypeIndex &count);
-FontTypeIndex FontType_RegisterFont(pk_cstr title, AssetHandle fontTexture, AssetHandle glyphs);
+FontTypeIndex FontType_RegisterFont(pk_cstr title, AssetHandle fontTextureHandle, AssetHandle glyphsHandle);
void FontType_Unload(FontTypeIndex idx);
FontRender FontType_AddStringRender(FontTypeIndex idx_ft, pk_cstr cstr);
void FontType_RemoveStringRender(FontRender fr);