From 92ef16ff00c578f33b323ebe9f5ba43e3b092d78 Mon Sep 17 00:00:00 2001 From: Stephan Dilly Date: Sat, 25 Jul 2015 16:55:48 +0200 Subject: [PATCH] upgrade to imgui 1.43 --- cimgui/cimgui.cpp | 11 ++++++++--- cimgui/cimgui.h | 26 +++++++++++++++++++------- cimgui/drawList.cpp | 31 +++++++++++++++++++++++-------- cimgui/fontAtlas.cpp | 21 +++++++++++++-------- imgui | 2 +- 5 files changed, 64 insertions(+), 27 deletions(-) diff --git a/cimgui/cimgui.cpp b/cimgui/cimgui.cpp index 95162c5..6d6e12a 100644 --- a/cimgui/cimgui.cpp +++ b/cimgui/cimgui.cpp @@ -402,9 +402,9 @@ CIMGUI_API void igSeparator() return ImGui::Separator(); } -CIMGUI_API void igSameLine(int column_x, int spacing_w) +CIMGUI_API void igSameLine(float pos_x, float spacing_w) { - return ImGui::SameLine(column_x, spacing_w); + return ImGui::SameLine(pos_x, spacing_w); } CIMGUI_API void igSpacing() @@ -546,7 +546,7 @@ CIMGUI_API void igPushIdPtr(CONST void* ptr_id) return ImGui::PushID(ptr_id); } -CIMGUI_API void igPushIdInt(CONST int int_id) +CIMGUI_API void igPushIdInt(int int_id) { return ImGui::PushID(int_id); } @@ -1358,3 +1358,8 @@ CIMGUI_API void ImGuiIO_AddInputCharacter(unsigned short c) { ImGui::GetIO().AddInputCharacter(c); } + +CIMGUI_API void ImGuiIO_AddInputCharactersUTF8(CONST char* utf8_chars) +{ + return ImGui::GetIO().AddInputCharactersUTF8(utf8_chars); +} diff --git a/cimgui/cimgui.h b/cimgui/cimgui.h index 3adc5a0..f57969a 100644 --- a/cimgui/cimgui.h +++ b/cimgui/cimgui.h @@ -99,7 +99,7 @@ CIMGUI_API void igPopButtonRepeat(); CIMGUI_API void igBeginGroup(); CIMGUI_API void igEndGroup(); CIMGUI_API void igSeparator(); -CIMGUI_API void igSameLine(int column_x, int spacing_w); +CIMGUI_API void igSameLine(float pos_x, float spacing_w); CIMGUI_API void igSpacing(); CIMGUI_API void igDummy(CONST ImVec2* size); CIMGUI_API void igIndent(); @@ -131,7 +131,7 @@ CIMGUI_API float igGetItemsLineHeightWithSpacing(); CIMGUI_API void igPushIdStr(CONST char* str_id); CIMGUI_API void igPushIdStrRange(CONST char* str_begin, CONST char* str_end); CIMGUI_API void igPushIdPtr(CONST void* ptr_id); -CIMGUI_API void igPushIdInt(CONST int int_id); +CIMGUI_API void igPushIdInt(int int_id); CIMGUI_API void igPopId(); CIMGUI_API ImGuiID igGetIdStr(CONST char* str_id); CIMGUI_API ImGuiID igGetIdStrRange(CONST char* str_begin,CONST char* str_end); @@ -330,9 +330,21 @@ CIMGUI_API void igSetInternalState(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* ttf_data, int ttf_size, float size_pixels, CONST ImWchar* glyph_ranges, int font_no); -CIMGUI_API ImFont* ImFontAtlas_AddFontFromMemoryCompressedTTF(ImFontAtlas* atlas, CONST void* compressed_ttf_data, int compressed_ttf_size, float size_pixels, CONST ImWchar* glyph_ranges, int font_no); +CIMGUI_API ImFont* ImFontAtlas_AddFont(ImFontAtlas* atlas, CONST ImFontConfig* font_cfg); +CIMGUI_API ImFont* ImFontAtlas_AddFontDefault(ImFontAtlas* atlas, CONST ImFontConfig* font_cfg); +CIMGUI_API ImFont* ImFontAtlas_AddFontFromFileTTF(ImFontAtlas* atlas, CONST char* filename, float size_pixels, CONST ImFontConfig* font_cfg, CONST ImWchar* glyph_ranges); +CIMGUI_API ImFont* ImFontAtlas_AddFontFromMemoryTTF(ImFontAtlas* atlas, void* ttf_data, int ttf_size, float size_pixels, CONST ImFontConfig* font_cfg, CONST ImWchar* glyph_ranges); +CIMGUI_API ImFont* ImFontAtlas_AddFontFromMemoryCompressedTTF(ImFontAtlas* atlas, CONST void* compressed_ttf_data, int compressed_ttf_size, float size_pixels, CONST ImFontConfig* font_cfg, CONST ImWchar* glyph_ranges); CIMGUI_API void ImFontAtlas_ClearTexData(ImFontAtlas* atlas); -CIMGUI_API void ImFontAtlas_Clear(ImFontAtlas* atlas); \ No newline at end of file +CIMGUI_API void ImFontAtlas_Clear(ImFontAtlas* atlas); + +CIMGUI_API void ImGuiIO_AddInputCharacter(unsigned short c); +CIMGUI_API void ImGuiIO_AddInputCharactersUTF8(CONST char* utf8_chars); + +CIMGUI_API int ImDrawList_GetVertexBufferSize(ImDrawList* list); +CIMGUI_API ImDrawVert* ImDrawList_GetVertexPtr(ImDrawList* list, int n); +CIMGUI_API int ImDrawList_GetIndexBufferSize(ImDrawList* list); +CIMGUI_API ImDrawIdx* ImDrawList_GetIndexPtr(ImDrawList* list, int n); +CIMGUI_API int ImDrawList_GetCmdSize(ImDrawList* list); +CIMGUI_API ImDrawCmd* ImDrawList_GetCmdPtr(ImDrawList* list, int n); +CIMGUI_API void ImDrawData_DeIndexAllBuffers(ImDrawData* drawData); diff --git a/cimgui/drawList.cpp b/cimgui/drawList.cpp index ef20a76..f25e460 100644 --- a/cimgui/drawList.cpp +++ b/cimgui/drawList.cpp @@ -2,22 +2,37 @@ #include "../imgui/imgui.h" #include "cimgui.h" -EXTERN API int ImDrawList_GetVertexBufferSize(ImDrawList* list) +CIMGUI_API int ImDrawList_GetVertexBufferSize(ImDrawList* list) { - return list->vtx_buffer.size(); + return list->VtxBuffer.size(); } -EXTERN API ImDrawVert* ImDrawList_GetVertexPtr(ImDrawList* list, int n) +CIMGUI_API ImDrawVert* ImDrawList_GetVertexPtr(ImDrawList* list, int n) { - return &list->vtx_buffer[n]; + return &list->VtxBuffer[n]; } -EXTERN API int ImDrawList_GetCmdSize(ImDrawList* list) +CIMGUI_API int ImDrawList_GetIndexBufferSize(ImDrawList* list) { - return list->commands.size(); + return list->IdxBuffer.size(); } -EXTERN API ImDrawCmd* ImDrawList_GetCmdPtr(ImDrawList* list, int n) +CIMGUI_API ImDrawIdx* ImDrawList_GetIndexPtr(ImDrawList* list, int n) { - return &list->commands[n]; + return &list->IdxBuffer[n]; +} + +CIMGUI_API int ImDrawList_GetCmdSize(ImDrawList* list) +{ + return list->CmdBuffer.size(); +} + +CIMGUI_API ImDrawCmd* ImDrawList_GetCmdPtr(ImDrawList* list, int n) +{ + return &list->CmdBuffer[n]; +} + +CIMGUI_API void ImDrawData_DeIndexAllBuffers(ImDrawData* drawData) +{ + return drawData->DeIndexAllBuffers(); } \ No newline at end of file diff --git a/cimgui/fontAtlas.cpp b/cimgui/fontAtlas.cpp index 949f2fb..fce9ee7 100644 --- a/cimgui/fontAtlas.cpp +++ b/cimgui/fontAtlas.cpp @@ -17,24 +17,29 @@ CIMGUI_API void ImFontAtlas_SetTexID(ImFontAtlas* atlas, void* tex) atlas->TexID = tex; } -CIMGUI_API ImFont* ImFontAtlas_AddFontDefault(ImFontAtlas* atlas) +CIMGUI_API ImFont* ImFontAtlas_AddFont(ImFontAtlas* atlas, CONST ImFontConfig* font_cfg) { - return atlas->AddFontDefault(); + return atlas->AddFont(font_cfg); } -CIMGUI_API ImFont* ImFontAtlas_AddFontFromFileTTF(ImFontAtlas* atlas,CONST char* filename, float size_pixels, CONST ImWchar* glyph_ranges, int font_no) +CIMGUI_API ImFont* ImFontAtlas_AddFontDefault(ImFontAtlas* atlas, CONST ImFontConfig* font_cfg) { - return atlas->AddFontFromFileTTF(filename, size_pixels, glyph_ranges, font_no); + return atlas->AddFontDefault(font_cfg); } -CIMGUI_API ImFont* ImFontAtlas_AddFontFromMemoryTTF(ImFontAtlas* atlas, void* ttf_data, int ttf_size, float size_pixels, CONST ImWchar* glyph_ranges, int font_no) +CIMGUI_API ImFont* ImFontAtlas_AddFontFromFileTTF(ImFontAtlas* atlas,CONST char* filename, float size_pixels, CONST ImFontConfig* font_cfg, CONST ImWchar* glyph_ranges) { - return atlas->AddFontFromMemoryTTF(ttf_data, ttf_size, size_pixels, glyph_ranges, font_no); + return atlas->AddFontFromFileTTF(filename, size_pixels, font_cfg, glyph_ranges); } -CIMGUI_API ImFont* ImFontAtlas_AddFontFromMemoryCompressedTTF(ImFontAtlas* atlas, CONST void* compressed_ttf_data, int compressed_ttf_size, float size_pixels, CONST ImWchar* glyph_ranges, int font_no) +CIMGUI_API ImFont* ImFontAtlas_AddFontFromMemoryTTF(ImFontAtlas* atlas, void* ttf_data, int ttf_size, float size_pixels, CONST ImFontConfig* font_cfg, CONST ImWchar* glyph_ranges) { - return atlas->AddFontFromMemoryCompressedTTF(compressed_ttf_data, compressed_ttf_size, size_pixels, glyph_ranges, font_no); + return atlas->AddFontFromMemoryTTF(ttf_data, ttf_size, size_pixels, font_cfg, glyph_ranges); +} + +CIMGUI_API ImFont* ImFontAtlas_AddFontFromMemoryCompressedTTF(ImFontAtlas* atlas, CONST void* compressed_ttf_data, int compressed_ttf_size, float size_pixels, CONST ImFontConfig* font_cfg, CONST ImWchar* glyph_ranges) +{ + return atlas->AddFontFromMemoryCompressedTTF(compressed_ttf_data, compressed_ttf_size, size_pixels, font_cfg, glyph_ranges); } CIMGUI_API void ImFontAtlas_ClearTexData(ImFontAtlas* atlas) diff --git a/imgui b/imgui index e5bea65..e8cb874 160000 --- a/imgui +++ b/imgui @@ -1 +1 @@ -Subproject commit e5bea65582bf8adf6fc05dfb22aa1aed5e43999d +Subproject commit e8cb874afeface49c20fdb39c6972f91df1c6d37