From 8a97a983a29ccd8cbf7bd873733593b9c01e7ba9 Mon Sep 17 00:00:00 2001 From: Stephan Dilly Date: Mon, 13 Apr 2015 21:31:19 +0200 Subject: [PATCH] added more fontAtlas methods --- cimgui/cimgui.h | 11 ++++++++++- cimgui/fontAtlas.cpp | 25 +++++++++++++++++++++++++ 2 files changed, 35 insertions(+), 1 deletion(-) diff --git a/cimgui/cimgui.h b/cimgui/cimgui.h index 39668ac..2e71273 100644 --- a/cimgui/cimgui.h +++ b/cimgui/cimgui.h @@ -277,4 +277,13 @@ CIMGUI_API void ig_ColorConvertHSVtoRGB(float h, float s, float v, float* out CIMGUI_API const char* ig_GetVersion(); CIMGUI_API void* ig_GetInternalState(); CIMGUI_API size_t ig_GetInternalStateSize(); -CIMGUI_API void ig_SetInternalState(void* state, bool construct); \ No newline at end of file +CIMGUI_API void ig_SetInternalState(void* state, bool construct); + +CIMGUI_API void ImFontAtlas_GetTexDataAsRGBA32(ImFontAtlas* atlas, unsigned char** out_pixels, int* out_width, int* out_height, int* out_bytes_per_pixel); +CIMGUI_API void ImFontAtlas_GetTexDataAsAlpha8(ImFontAtlas* atlas, unsigned char** out_pixels, int* out_width, int* out_height, int* out_bytes_per_pixel); +CIMGUI_API void ImFontAtlas_SetTexID(ImFontAtlas* atlas, void* tex); +CIMGUI_API ImFont* ImFontAtlas_AddFontDefault(ImFontAtlas* atlas); +CIMGUI_API ImFont* ImFontAtlas_AddFontFromFileTTF(ImFontAtlas* atlas, const char* filename, float size_pixels, const ImWchar* glyph_ranges, int font_no); +CIMGUI_API ImFont* ImFontAtlas_AddFontFromMemoryTTF(ImFontAtlas* atlas, void* in_ttf_data, size_t in_ttf_data_size, float size_pixels, const ImWchar* glyph_ranges, int font_no); +CIMGUI_API void ImFontAtlas_ClearTexData(ImFontAtlas* atlas); +CIMGUI_API void ImFontAtlas_Clear(ImFontAtlas* atlas); \ No newline at end of file diff --git a/cimgui/fontAtlas.cpp b/cimgui/fontAtlas.cpp index 9511dab..8425e81 100644 --- a/cimgui/fontAtlas.cpp +++ b/cimgui/fontAtlas.cpp @@ -15,4 +15,29 @@ CIMGUI_API void ImFontAtlas_GetTexDataAsAlpha8(ImFontAtlas* atlas, unsigned char CIMGUI_API void ImFontAtlas_SetTexID(ImFontAtlas* atlas, void* tex) { atlas->TexID = tex; +} + +CIMGUI_API ImFont* ImFontAtlas_AddFontDefault(ImFontAtlas* atlas) +{ + return atlas->AddFontDefault(); +} + +CIMGUI_API ImFont* ImFontAtlas_AddFontFromFileTTF(ImFontAtlas* atlas,const char* filename, float size_pixels, const ImWchar* glyph_ranges, int font_no) +{ + return atlas->AddFontFromFileTTF(filename, size_pixels, glyph_ranges, font_no); +} + +CIMGUI_API ImFont* ImFontAtlas_AddFontFromMemoryTTF(ImFontAtlas* atlas, void* in_ttf_data, size_t in_ttf_data_size, float size_pixels, const ImWchar* glyph_ranges, int font_no) +{ + return atlas->AddFontFromMemoryTTF(in_ttf_data, in_ttf_data_size, size_pixels, glyph_ranges, font_no); +} + +CIMGUI_API void ImFontAtlas_ClearTexData(ImFontAtlas* atlas) +{ + return atlas->ClearTexData(); +} + +CIMGUI_API void ImFontAtlas_Clear(ImFontAtlas* atlas) +{ + return atlas->Clear(); } \ No newline at end of file