From 4be0522d9f1513e9f14dd3510c396325007f58ad Mon Sep 17 00:00:00 2001 From: sonoro1234 Date: Wed, 13 Mar 2019 17:05:22 +0100 Subject: [PATCH] pull imgui 1.69 and generate --- cimgui.cpp | 38 ++++-- cimgui.h | 41 ++++-- generator/output/cimgui.cpp | 38 ++++-- generator/output/cimgui.h | 41 ++++-- generator/output/definitions.json | 173 ++++++++++++++++++------ generator/output/definitions.lua | 159 ++++++++++++++++------ generator/output/overloads.txt | 154 ++++++++++----------- generator/output/structs_and_enums.json | 86 ++++++++---- generator/output/structs_and_enums.lua | 98 +++++++++----- generator/output/typedefs_dict.json | 4 + generator/output/typedefs_dict.lua | 4 + imgui | 2 +- 12 files changed, 564 insertions(+), 274 deletions(-) diff --git a/cimgui.cpp b/cimgui.cpp index cb68ddd..b607cd1 100644 --- a/cimgui.cpp +++ b/cimgui.cpp @@ -1,5 +1,5 @@ //This file is automatically generated by generator.lua from https://github.com/cimgui/cimgui -//based on imgui.h file version "1.68" from Dear ImGui https://github.com/ocornut/imgui +//based on imgui.h file version "1.69" from Dear ImGui https://github.com/ocornut/imgui #include "./imgui/imgui.h" #include "cimgui.h" @@ -764,6 +764,10 @@ CIMGUI_API bool igInputTextMultiline(const char* label,char* buf,size_t buf_size { return ImGui::InputTextMultiline(label,buf,buf_size,size,flags,callback,user_data); } +CIMGUI_API bool igInputTextWithHint(const char* label,const char* hint,char* buf,size_t buf_size,ImGuiInputTextFlags flags,ImGuiInputTextCallback callback,void* user_data) +{ + return ImGui::InputTextWithHint(label,hint,buf,buf_size,flags,callback,user_data); +} CIMGUI_API bool igInputFloat(const char* label,float* v,float step,float step_fast,const char* format,ImGuiInputTextFlags flags) { return ImGui::InputFloat(label,v,step,step_fast,format,flags); @@ -1123,17 +1127,17 @@ CIMGUI_API void igSetTabItemClosed(const char* tab_or_docked_window_label) { return ImGui::SetTabItemClosed(tab_or_docked_window_label); } -CIMGUI_API void igLogToTTY(int max_depth) +CIMGUI_API void igLogToTTY(int auto_open_depth) { - return ImGui::LogToTTY(max_depth); + return ImGui::LogToTTY(auto_open_depth); } -CIMGUI_API void igLogToFile(int max_depth,const char* filename) +CIMGUI_API void igLogToFile(int auto_open_depth,const char* filename) { - return ImGui::LogToFile(max_depth,filename); + return ImGui::LogToFile(auto_open_depth,filename); } -CIMGUI_API void igLogToClipboard(int max_depth) +CIMGUI_API void igLogToClipboard(int auto_open_depth) { - return ImGui::LogToClipboard(max_depth); + return ImGui::LogToClipboard(auto_open_depth); } CIMGUI_API void igLogFinish() { @@ -1147,9 +1151,9 @@ CIMGUI_API bool igBeginDragDropSource(ImGuiDragDropFlags flags) { return ImGui::BeginDragDropSource(flags); } -CIMGUI_API bool igSetDragDropPayload(const char* type,const void* data,size_t size,ImGuiCond cond) +CIMGUI_API bool igSetDragDropPayload(const char* type,const void* data,size_t sz,ImGuiCond cond) { - return ImGui::SetDragDropPayload(type,data,size,cond); + return ImGui::SetDragDropPayload(type,data,sz,cond); } CIMGUI_API void igEndDragDropSource() { @@ -1267,9 +1271,13 @@ CIMGUI_API int igGetFrameCount() { return ImGui::GetFrameCount(); } -CIMGUI_API ImDrawList* igGetOverlayDrawList() +CIMGUI_API ImDrawList* igGetBackgroundDrawList() { - return ImGui::GetOverlayDrawList(); + return ImGui::GetBackgroundDrawList(); +} +CIMGUI_API ImDrawList* igGetForegroundDrawList() +{ + return ImGui::GetForegroundDrawList(); } CIMGUI_API ImDrawListSharedData* igGetDrawListSharedData() { @@ -1847,11 +1855,11 @@ CIMGUI_API void ImDrawList_AddImageRounded(ImDrawList* self,ImTextureID user_tex { return self->AddImageRounded(user_texture_id,a,b,uv_a,uv_b,col,rounding,rounding_corners); } -CIMGUI_API void ImDrawList_AddPolyline(ImDrawList* self,const ImVec2* points,const int num_points,ImU32 col,bool closed,float thickness) +CIMGUI_API void ImDrawList_AddPolyline(ImDrawList* self,const ImVec2* points,int num_points,ImU32 col,bool closed,float thickness) { return self->AddPolyline(points,num_points,col,closed,thickness); } -CIMGUI_API void ImDrawList_AddConvexPolyFilled(ImDrawList* self,const ImVec2* points,const int num_points,ImU32 col) +CIMGUI_API void ImDrawList_AddConvexPolyFilled(ImDrawList* self,const ImVec2* points,int num_points,ImU32 col) { return self->AddConvexPolyFilled(points,num_points,col); } @@ -2119,6 +2127,10 @@ CIMGUI_API const ImWchar* ImFontAtlas_GetGlyphRangesThai(ImFontAtlas* self) { return self->GetGlyphRangesThai(); } +CIMGUI_API const ImWchar* ImFontAtlas_GetGlyphRangesVietnamese(ImFontAtlas* self) +{ + return self->GetGlyphRangesVietnamese(); +} CIMGUI_API CustomRect* CustomRect_CustomRect(void) { return IM_NEW(CustomRect)(); diff --git a/cimgui.h b/cimgui.h index 0a0fa72..e01f3a2 100644 --- a/cimgui.h +++ b/cimgui.h @@ -1,5 +1,5 @@ //This file is automatically generated by generator.lua from https://github.com/cimgui/cimgui -//based on imgui.h file version "1.68" from Dear ImGui https://github.com/ocornut/imgui +//based on imgui.h file version "1.69" from Dear ImGui https://github.com/ocornut/imgui #ifndef CIMGUI_INCLUDED #define CIMGUI_INCLUDED #include @@ -124,6 +124,10 @@ typedef int ImGuiTreeNodeFlags; typedef int ImGuiWindowFlags; typedef int (*ImGuiInputTextCallback)(ImGuiInputTextCallbackData *data); typedef void (*ImGuiSizeCallback)(ImGuiSizeCallbackData* data); +typedef signed char ImS8; +typedef unsigned char ImU8; +typedef signed short ImS16; +typedef unsigned short ImU16; typedef signed int ImS32; typedef unsigned int ImU32; typedef int64_t ImS64; @@ -309,6 +313,10 @@ enum ImGuiDragDropFlags_ }; enum ImGuiDataType_ { + ImGuiDataType_S8, + ImGuiDataType_U8, + ImGuiDataType_S16, + ImGuiDataType_U16, ImGuiDataType_S32, ImGuiDataType_U32, ImGuiDataType_S64, @@ -370,6 +378,7 @@ enum ImGuiNavInput_ ImGuiNavInput_TweakSlow, ImGuiNavInput_TweakFast, ImGuiNavInput_KeyMenu_, + ImGuiNavInput_KeyTab_, ImGuiNavInput_KeyLeft_, ImGuiNavInput_KeyRight_, ImGuiNavInput_KeyUp_, @@ -491,17 +500,20 @@ enum ImGuiColorEditFlags_ ImGuiColorEditFlags_AlphaPreview = 1 << 17, ImGuiColorEditFlags_AlphaPreviewHalf= 1 << 18, ImGuiColorEditFlags_HDR = 1 << 19, - ImGuiColorEditFlags_RGB = 1 << 20, - ImGuiColorEditFlags_HSV = 1 << 21, - ImGuiColorEditFlags_HEX = 1 << 22, + ImGuiColorEditFlags_DisplayRGB = 1 << 20, + ImGuiColorEditFlags_DisplayHSV = 1 << 21, + ImGuiColorEditFlags_DisplayHex = 1 << 22, ImGuiColorEditFlags_Uint8 = 1 << 23, ImGuiColorEditFlags_Float = 1 << 24, ImGuiColorEditFlags_PickerHueBar = 1 << 25, ImGuiColorEditFlags_PickerHueWheel = 1 << 26, - ImGuiColorEditFlags__InputsMask = ImGuiColorEditFlags_RGB|ImGuiColorEditFlags_HSV|ImGuiColorEditFlags_HEX, + ImGuiColorEditFlags_InputRGB = 1 << 27, + ImGuiColorEditFlags_InputHSV = 1 << 28, + ImGuiColorEditFlags__OptionsDefault = ImGuiColorEditFlags_Uint8|ImGuiColorEditFlags_DisplayRGB|ImGuiColorEditFlags_InputRGB|ImGuiColorEditFlags_PickerHueBar, + ImGuiColorEditFlags__DisplayMask = ImGuiColorEditFlags_DisplayRGB|ImGuiColorEditFlags_DisplayHSV|ImGuiColorEditFlags_DisplayHex, ImGuiColorEditFlags__DataTypeMask = ImGuiColorEditFlags_Uint8|ImGuiColorEditFlags_Float, ImGuiColorEditFlags__PickerMask = ImGuiColorEditFlags_PickerHueWheel|ImGuiColorEditFlags_PickerHueBar, - ImGuiColorEditFlags__OptionsDefault = ImGuiColorEditFlags_Uint8|ImGuiColorEditFlags_RGB|ImGuiColorEditFlags_PickerHueBar + ImGuiColorEditFlags__InputMask = ImGuiColorEditFlags_InputRGB|ImGuiColorEditFlags_InputHSV }; enum ImGuiMouseCursor_ { @@ -1092,6 +1104,7 @@ CIMGUI_API bool igVSliderInt(const char* label,const ImVec2 size,int* v,int v_mi CIMGUI_API bool igVSliderScalar(const char* label,const ImVec2 size,ImGuiDataType data_type,void* v,const void* v_min,const void* v_max,const char* format,float power); CIMGUI_API bool igInputText(const char* label,char* buf,size_t buf_size,ImGuiInputTextFlags flags,ImGuiInputTextCallback callback,void* user_data); CIMGUI_API bool igInputTextMultiline(const char* label,char* buf,size_t buf_size,const ImVec2 size,ImGuiInputTextFlags flags,ImGuiInputTextCallback callback,void* user_data); +CIMGUI_API bool igInputTextWithHint(const char* label,const char* hint,char* buf,size_t buf_size,ImGuiInputTextFlags flags,ImGuiInputTextCallback callback,void* user_data); CIMGUI_API bool igInputFloat(const char* label,float* v,float step,float step_fast,const char* format,ImGuiInputTextFlags flags); CIMGUI_API bool igInputFloat2(const char* label,float v[2],const char* format,ImGuiInputTextFlags flags); CIMGUI_API bool igInputFloat3(const char* label,float v[3],const char* format,ImGuiInputTextFlags flags); @@ -1177,13 +1190,13 @@ CIMGUI_API void igEndTabBar(void); CIMGUI_API bool igBeginTabItem(const char* label,bool* p_open,ImGuiTabItemFlags flags); CIMGUI_API void igEndTabItem(void); CIMGUI_API void igSetTabItemClosed(const char* tab_or_docked_window_label); -CIMGUI_API void igLogToTTY(int max_depth); -CIMGUI_API void igLogToFile(int max_depth,const char* filename); -CIMGUI_API void igLogToClipboard(int max_depth); +CIMGUI_API void igLogToTTY(int auto_open_depth); +CIMGUI_API void igLogToFile(int auto_open_depth,const char* filename); +CIMGUI_API void igLogToClipboard(int auto_open_depth); CIMGUI_API void igLogFinish(void); CIMGUI_API void igLogButtons(void); CIMGUI_API bool igBeginDragDropSource(ImGuiDragDropFlags flags); -CIMGUI_API bool igSetDragDropPayload(const char* type,const void* data,size_t size,ImGuiCond cond); +CIMGUI_API bool igSetDragDropPayload(const char* type,const void* data,size_t sz,ImGuiCond cond); CIMGUI_API void igEndDragDropSource(void); CIMGUI_API bool igBeginDragDropTarget(void); CIMGUI_API const ImGuiPayload* igAcceptDragDropPayload(const char* type,ImGuiDragDropFlags flags); @@ -1213,7 +1226,8 @@ CIMGUI_API bool igIsRectVisible(const ImVec2 size); CIMGUI_API bool igIsRectVisibleVec2(const ImVec2 rect_min,const ImVec2 rect_max); CIMGUI_API double igGetTime(void); CIMGUI_API int igGetFrameCount(void); -CIMGUI_API ImDrawList* igGetOverlayDrawList(void); +CIMGUI_API ImDrawList* igGetBackgroundDrawList(void); +CIMGUI_API ImDrawList* igGetForegroundDrawList(void); CIMGUI_API ImDrawListSharedData* igGetDrawListSharedData(void); CIMGUI_API const char* igGetStyleColorName(ImGuiCol idx); CIMGUI_API void igSetStateStorage(ImGuiStorage* storage); @@ -1358,8 +1372,8 @@ CIMGUI_API void ImDrawList_AddTextFontPtr(ImDrawList* self,const ImFont* font,fl CIMGUI_API void ImDrawList_AddImage(ImDrawList* self,ImTextureID user_texture_id,const ImVec2 a,const ImVec2 b,const ImVec2 uv_a,const ImVec2 uv_b,ImU32 col); CIMGUI_API void ImDrawList_AddImageQuad(ImDrawList* self,ImTextureID user_texture_id,const ImVec2 a,const ImVec2 b,const ImVec2 c,const ImVec2 d,const ImVec2 uv_a,const ImVec2 uv_b,const ImVec2 uv_c,const ImVec2 uv_d,ImU32 col); CIMGUI_API void ImDrawList_AddImageRounded(ImDrawList* self,ImTextureID user_texture_id,const ImVec2 a,const ImVec2 b,const ImVec2 uv_a,const ImVec2 uv_b,ImU32 col,float rounding,int rounding_corners); -CIMGUI_API void ImDrawList_AddPolyline(ImDrawList* self,const ImVec2* points,const int num_points,ImU32 col,bool closed,float thickness); -CIMGUI_API void ImDrawList_AddConvexPolyFilled(ImDrawList* self,const ImVec2* points,const int num_points,ImU32 col); +CIMGUI_API void ImDrawList_AddPolyline(ImDrawList* self,const ImVec2* points,int num_points,ImU32 col,bool closed,float thickness); +CIMGUI_API void ImDrawList_AddConvexPolyFilled(ImDrawList* self,const ImVec2* points,int num_points,ImU32 col); CIMGUI_API void ImDrawList_AddBezierCurve(ImDrawList* self,const ImVec2 pos0,const ImVec2 cp0,const ImVec2 cp1,const ImVec2 pos1,ImU32 col,float thickness,int num_segments); CIMGUI_API void ImDrawList_PathClear(ImDrawList* self); CIMGUI_API void ImDrawList_PathLineTo(ImDrawList* self,const ImVec2 pos); @@ -1426,6 +1440,7 @@ CIMGUI_API const ImWchar* ImFontAtlas_GetGlyphRangesChineseFull(ImFontAtlas* sel CIMGUI_API const ImWchar* ImFontAtlas_GetGlyphRangesChineseSimplifiedCommon(ImFontAtlas* self); CIMGUI_API const ImWchar* ImFontAtlas_GetGlyphRangesCyrillic(ImFontAtlas* self); CIMGUI_API const ImWchar* ImFontAtlas_GetGlyphRangesThai(ImFontAtlas* self); +CIMGUI_API const ImWchar* ImFontAtlas_GetGlyphRangesVietnamese(ImFontAtlas* self); CIMGUI_API CustomRect* CustomRect_CustomRect(void); CIMGUI_API void CustomRect_destroy(CustomRect* self); CIMGUI_API bool CustomRect_IsPacked(CustomRect* self); diff --git a/generator/output/cimgui.cpp b/generator/output/cimgui.cpp index cb68ddd..b607cd1 100644 --- a/generator/output/cimgui.cpp +++ b/generator/output/cimgui.cpp @@ -1,5 +1,5 @@ //This file is automatically generated by generator.lua from https://github.com/cimgui/cimgui -//based on imgui.h file version "1.68" from Dear ImGui https://github.com/ocornut/imgui +//based on imgui.h file version "1.69" from Dear ImGui https://github.com/ocornut/imgui #include "./imgui/imgui.h" #include "cimgui.h" @@ -764,6 +764,10 @@ CIMGUI_API bool igInputTextMultiline(const char* label,char* buf,size_t buf_size { return ImGui::InputTextMultiline(label,buf,buf_size,size,flags,callback,user_data); } +CIMGUI_API bool igInputTextWithHint(const char* label,const char* hint,char* buf,size_t buf_size,ImGuiInputTextFlags flags,ImGuiInputTextCallback callback,void* user_data) +{ + return ImGui::InputTextWithHint(label,hint,buf,buf_size,flags,callback,user_data); +} CIMGUI_API bool igInputFloat(const char* label,float* v,float step,float step_fast,const char* format,ImGuiInputTextFlags flags) { return ImGui::InputFloat(label,v,step,step_fast,format,flags); @@ -1123,17 +1127,17 @@ CIMGUI_API void igSetTabItemClosed(const char* tab_or_docked_window_label) { return ImGui::SetTabItemClosed(tab_or_docked_window_label); } -CIMGUI_API void igLogToTTY(int max_depth) +CIMGUI_API void igLogToTTY(int auto_open_depth) { - return ImGui::LogToTTY(max_depth); + return ImGui::LogToTTY(auto_open_depth); } -CIMGUI_API void igLogToFile(int max_depth,const char* filename) +CIMGUI_API void igLogToFile(int auto_open_depth,const char* filename) { - return ImGui::LogToFile(max_depth,filename); + return ImGui::LogToFile(auto_open_depth,filename); } -CIMGUI_API void igLogToClipboard(int max_depth) +CIMGUI_API void igLogToClipboard(int auto_open_depth) { - return ImGui::LogToClipboard(max_depth); + return ImGui::LogToClipboard(auto_open_depth); } CIMGUI_API void igLogFinish() { @@ -1147,9 +1151,9 @@ CIMGUI_API bool igBeginDragDropSource(ImGuiDragDropFlags flags) { return ImGui::BeginDragDropSource(flags); } -CIMGUI_API bool igSetDragDropPayload(const char* type,const void* data,size_t size,ImGuiCond cond) +CIMGUI_API bool igSetDragDropPayload(const char* type,const void* data,size_t sz,ImGuiCond cond) { - return ImGui::SetDragDropPayload(type,data,size,cond); + return ImGui::SetDragDropPayload(type,data,sz,cond); } CIMGUI_API void igEndDragDropSource() { @@ -1267,9 +1271,13 @@ CIMGUI_API int igGetFrameCount() { return ImGui::GetFrameCount(); } -CIMGUI_API ImDrawList* igGetOverlayDrawList() +CIMGUI_API ImDrawList* igGetBackgroundDrawList() { - return ImGui::GetOverlayDrawList(); + return ImGui::GetBackgroundDrawList(); +} +CIMGUI_API ImDrawList* igGetForegroundDrawList() +{ + return ImGui::GetForegroundDrawList(); } CIMGUI_API ImDrawListSharedData* igGetDrawListSharedData() { @@ -1847,11 +1855,11 @@ CIMGUI_API void ImDrawList_AddImageRounded(ImDrawList* self,ImTextureID user_tex { return self->AddImageRounded(user_texture_id,a,b,uv_a,uv_b,col,rounding,rounding_corners); } -CIMGUI_API void ImDrawList_AddPolyline(ImDrawList* self,const ImVec2* points,const int num_points,ImU32 col,bool closed,float thickness) +CIMGUI_API void ImDrawList_AddPolyline(ImDrawList* self,const ImVec2* points,int num_points,ImU32 col,bool closed,float thickness) { return self->AddPolyline(points,num_points,col,closed,thickness); } -CIMGUI_API void ImDrawList_AddConvexPolyFilled(ImDrawList* self,const ImVec2* points,const int num_points,ImU32 col) +CIMGUI_API void ImDrawList_AddConvexPolyFilled(ImDrawList* self,const ImVec2* points,int num_points,ImU32 col) { return self->AddConvexPolyFilled(points,num_points,col); } @@ -2119,6 +2127,10 @@ CIMGUI_API const ImWchar* ImFontAtlas_GetGlyphRangesThai(ImFontAtlas* self) { return self->GetGlyphRangesThai(); } +CIMGUI_API const ImWchar* ImFontAtlas_GetGlyphRangesVietnamese(ImFontAtlas* self) +{ + return self->GetGlyphRangesVietnamese(); +} CIMGUI_API CustomRect* CustomRect_CustomRect(void) { return IM_NEW(CustomRect)(); diff --git a/generator/output/cimgui.h b/generator/output/cimgui.h index 0a0fa72..e01f3a2 100644 --- a/generator/output/cimgui.h +++ b/generator/output/cimgui.h @@ -1,5 +1,5 @@ //This file is automatically generated by generator.lua from https://github.com/cimgui/cimgui -//based on imgui.h file version "1.68" from Dear ImGui https://github.com/ocornut/imgui +//based on imgui.h file version "1.69" from Dear ImGui https://github.com/ocornut/imgui #ifndef CIMGUI_INCLUDED #define CIMGUI_INCLUDED #include @@ -124,6 +124,10 @@ typedef int ImGuiTreeNodeFlags; typedef int ImGuiWindowFlags; typedef int (*ImGuiInputTextCallback)(ImGuiInputTextCallbackData *data); typedef void (*ImGuiSizeCallback)(ImGuiSizeCallbackData* data); +typedef signed char ImS8; +typedef unsigned char ImU8; +typedef signed short ImS16; +typedef unsigned short ImU16; typedef signed int ImS32; typedef unsigned int ImU32; typedef int64_t ImS64; @@ -309,6 +313,10 @@ enum ImGuiDragDropFlags_ }; enum ImGuiDataType_ { + ImGuiDataType_S8, + ImGuiDataType_U8, + ImGuiDataType_S16, + ImGuiDataType_U16, ImGuiDataType_S32, ImGuiDataType_U32, ImGuiDataType_S64, @@ -370,6 +378,7 @@ enum ImGuiNavInput_ ImGuiNavInput_TweakSlow, ImGuiNavInput_TweakFast, ImGuiNavInput_KeyMenu_, + ImGuiNavInput_KeyTab_, ImGuiNavInput_KeyLeft_, ImGuiNavInput_KeyRight_, ImGuiNavInput_KeyUp_, @@ -491,17 +500,20 @@ enum ImGuiColorEditFlags_ ImGuiColorEditFlags_AlphaPreview = 1 << 17, ImGuiColorEditFlags_AlphaPreviewHalf= 1 << 18, ImGuiColorEditFlags_HDR = 1 << 19, - ImGuiColorEditFlags_RGB = 1 << 20, - ImGuiColorEditFlags_HSV = 1 << 21, - ImGuiColorEditFlags_HEX = 1 << 22, + ImGuiColorEditFlags_DisplayRGB = 1 << 20, + ImGuiColorEditFlags_DisplayHSV = 1 << 21, + ImGuiColorEditFlags_DisplayHex = 1 << 22, ImGuiColorEditFlags_Uint8 = 1 << 23, ImGuiColorEditFlags_Float = 1 << 24, ImGuiColorEditFlags_PickerHueBar = 1 << 25, ImGuiColorEditFlags_PickerHueWheel = 1 << 26, - ImGuiColorEditFlags__InputsMask = ImGuiColorEditFlags_RGB|ImGuiColorEditFlags_HSV|ImGuiColorEditFlags_HEX, + ImGuiColorEditFlags_InputRGB = 1 << 27, + ImGuiColorEditFlags_InputHSV = 1 << 28, + ImGuiColorEditFlags__OptionsDefault = ImGuiColorEditFlags_Uint8|ImGuiColorEditFlags_DisplayRGB|ImGuiColorEditFlags_InputRGB|ImGuiColorEditFlags_PickerHueBar, + ImGuiColorEditFlags__DisplayMask = ImGuiColorEditFlags_DisplayRGB|ImGuiColorEditFlags_DisplayHSV|ImGuiColorEditFlags_DisplayHex, ImGuiColorEditFlags__DataTypeMask = ImGuiColorEditFlags_Uint8|ImGuiColorEditFlags_Float, ImGuiColorEditFlags__PickerMask = ImGuiColorEditFlags_PickerHueWheel|ImGuiColorEditFlags_PickerHueBar, - ImGuiColorEditFlags__OptionsDefault = ImGuiColorEditFlags_Uint8|ImGuiColorEditFlags_RGB|ImGuiColorEditFlags_PickerHueBar + ImGuiColorEditFlags__InputMask = ImGuiColorEditFlags_InputRGB|ImGuiColorEditFlags_InputHSV }; enum ImGuiMouseCursor_ { @@ -1092,6 +1104,7 @@ CIMGUI_API bool igVSliderInt(const char* label,const ImVec2 size,int* v,int v_mi CIMGUI_API bool igVSliderScalar(const char* label,const ImVec2 size,ImGuiDataType data_type,void* v,const void* v_min,const void* v_max,const char* format,float power); CIMGUI_API bool igInputText(const char* label,char* buf,size_t buf_size,ImGuiInputTextFlags flags,ImGuiInputTextCallback callback,void* user_data); CIMGUI_API bool igInputTextMultiline(const char* label,char* buf,size_t buf_size,const ImVec2 size,ImGuiInputTextFlags flags,ImGuiInputTextCallback callback,void* user_data); +CIMGUI_API bool igInputTextWithHint(const char* label,const char* hint,char* buf,size_t buf_size,ImGuiInputTextFlags flags,ImGuiInputTextCallback callback,void* user_data); CIMGUI_API bool igInputFloat(const char* label,float* v,float step,float step_fast,const char* format,ImGuiInputTextFlags flags); CIMGUI_API bool igInputFloat2(const char* label,float v[2],const char* format,ImGuiInputTextFlags flags); CIMGUI_API bool igInputFloat3(const char* label,float v[3],const char* format,ImGuiInputTextFlags flags); @@ -1177,13 +1190,13 @@ CIMGUI_API void igEndTabBar(void); CIMGUI_API bool igBeginTabItem(const char* label,bool* p_open,ImGuiTabItemFlags flags); CIMGUI_API void igEndTabItem(void); CIMGUI_API void igSetTabItemClosed(const char* tab_or_docked_window_label); -CIMGUI_API void igLogToTTY(int max_depth); -CIMGUI_API void igLogToFile(int max_depth,const char* filename); -CIMGUI_API void igLogToClipboard(int max_depth); +CIMGUI_API void igLogToTTY(int auto_open_depth); +CIMGUI_API void igLogToFile(int auto_open_depth,const char* filename); +CIMGUI_API void igLogToClipboard(int auto_open_depth); CIMGUI_API void igLogFinish(void); CIMGUI_API void igLogButtons(void); CIMGUI_API bool igBeginDragDropSource(ImGuiDragDropFlags flags); -CIMGUI_API bool igSetDragDropPayload(const char* type,const void* data,size_t size,ImGuiCond cond); +CIMGUI_API bool igSetDragDropPayload(const char* type,const void* data,size_t sz,ImGuiCond cond); CIMGUI_API void igEndDragDropSource(void); CIMGUI_API bool igBeginDragDropTarget(void); CIMGUI_API const ImGuiPayload* igAcceptDragDropPayload(const char* type,ImGuiDragDropFlags flags); @@ -1213,7 +1226,8 @@ CIMGUI_API bool igIsRectVisible(const ImVec2 size); CIMGUI_API bool igIsRectVisibleVec2(const ImVec2 rect_min,const ImVec2 rect_max); CIMGUI_API double igGetTime(void); CIMGUI_API int igGetFrameCount(void); -CIMGUI_API ImDrawList* igGetOverlayDrawList(void); +CIMGUI_API ImDrawList* igGetBackgroundDrawList(void); +CIMGUI_API ImDrawList* igGetForegroundDrawList(void); CIMGUI_API ImDrawListSharedData* igGetDrawListSharedData(void); CIMGUI_API const char* igGetStyleColorName(ImGuiCol idx); CIMGUI_API void igSetStateStorage(ImGuiStorage* storage); @@ -1358,8 +1372,8 @@ CIMGUI_API void ImDrawList_AddTextFontPtr(ImDrawList* self,const ImFont* font,fl CIMGUI_API void ImDrawList_AddImage(ImDrawList* self,ImTextureID user_texture_id,const ImVec2 a,const ImVec2 b,const ImVec2 uv_a,const ImVec2 uv_b,ImU32 col); CIMGUI_API void ImDrawList_AddImageQuad(ImDrawList* self,ImTextureID user_texture_id,const ImVec2 a,const ImVec2 b,const ImVec2 c,const ImVec2 d,const ImVec2 uv_a,const ImVec2 uv_b,const ImVec2 uv_c,const ImVec2 uv_d,ImU32 col); CIMGUI_API void ImDrawList_AddImageRounded(ImDrawList* self,ImTextureID user_texture_id,const ImVec2 a,const ImVec2 b,const ImVec2 uv_a,const ImVec2 uv_b,ImU32 col,float rounding,int rounding_corners); -CIMGUI_API void ImDrawList_AddPolyline(ImDrawList* self,const ImVec2* points,const int num_points,ImU32 col,bool closed,float thickness); -CIMGUI_API void ImDrawList_AddConvexPolyFilled(ImDrawList* self,const ImVec2* points,const int num_points,ImU32 col); +CIMGUI_API void ImDrawList_AddPolyline(ImDrawList* self,const ImVec2* points,int num_points,ImU32 col,bool closed,float thickness); +CIMGUI_API void ImDrawList_AddConvexPolyFilled(ImDrawList* self,const ImVec2* points,int num_points,ImU32 col); CIMGUI_API void ImDrawList_AddBezierCurve(ImDrawList* self,const ImVec2 pos0,const ImVec2 cp0,const ImVec2 cp1,const ImVec2 pos1,ImU32 col,float thickness,int num_segments); CIMGUI_API void ImDrawList_PathClear(ImDrawList* self); CIMGUI_API void ImDrawList_PathLineTo(ImDrawList* self,const ImVec2 pos); @@ -1426,6 +1440,7 @@ CIMGUI_API const ImWchar* ImFontAtlas_GetGlyphRangesChineseFull(ImFontAtlas* sel CIMGUI_API const ImWchar* ImFontAtlas_GetGlyphRangesChineseSimplifiedCommon(ImFontAtlas* self); CIMGUI_API const ImWchar* ImFontAtlas_GetGlyphRangesCyrillic(ImFontAtlas* self); CIMGUI_API const ImWchar* ImFontAtlas_GetGlyphRangesThai(ImFontAtlas* self); +CIMGUI_API const ImWchar* ImFontAtlas_GetGlyphRangesVietnamese(ImFontAtlas* self); CIMGUI_API CustomRect* CustomRect_CustomRect(void); CIMGUI_API void CustomRect_destroy(CustomRect* self); CIMGUI_API bool CustomRect_IsPacked(CustomRect* self); diff --git a/generator/output/definitions.json b/generator/output/definitions.json index 31f5ab0..7fc3ae5 100644 --- a/generator/output/definitions.json +++ b/generator/output/definitions.json @@ -635,7 +635,7 @@ ], "ImDrawList_AddConvexPolyFilled": [ { - "args": "(ImDrawList* self,const ImVec2* points,const int num_points,ImU32 col)", + "args": "(ImDrawList* self,const ImVec2* points,int num_points,ImU32 col)", "argsT": [ { "name": "self", @@ -647,21 +647,21 @@ }, { "name": "num_points", - "type": "const int" + "type": "int" }, { "name": "col", "type": "ImU32" } ], - "argsoriginal": "(const ImVec2* points,const int num_points,ImU32 col)", + "argsoriginal": "(const ImVec2* points,int num_points,ImU32 col)", "call_args": "(points,num_points,col)", "cimguiname": "ImDrawList_AddConvexPolyFilled", "defaults": [], "funcname": "AddConvexPolyFilled", "ov_cimguiname": "ImDrawList_AddConvexPolyFilled", "ret": "void", - "signature": "(const ImVec2*,const int,ImU32)", + "signature": "(const ImVec2*,int,ImU32)", "stname": "ImDrawList" } ], @@ -893,7 +893,7 @@ ], "ImDrawList_AddPolyline": [ { - "args": "(ImDrawList* self,const ImVec2* points,const int num_points,ImU32 col,bool closed,float thickness)", + "args": "(ImDrawList* self,const ImVec2* points,int num_points,ImU32 col,bool closed,float thickness)", "argsT": [ { "name": "self", @@ -905,7 +905,7 @@ }, { "name": "num_points", - "type": "const int" + "type": "int" }, { "name": "col", @@ -920,14 +920,14 @@ "type": "float" } ], - "argsoriginal": "(const ImVec2* points,const int num_points,ImU32 col,bool closed,float thickness)", + "argsoriginal": "(const ImVec2* points,int num_points,ImU32 col,bool closed,float thickness)", "call_args": "(points,num_points,col,closed,thickness)", "cimguiname": "ImDrawList_AddPolyline", "defaults": [], "funcname": "AddPolyline", "ov_cimguiname": "ImDrawList_AddPolyline", "ret": "void", - "signature": "(const ImVec2*,const int,ImU32,bool,float)", + "signature": "(const ImVec2*,int,ImU32,bool,float)", "stname": "ImDrawList" } ], @@ -2886,6 +2886,26 @@ "stname": "ImFontAtlas" } ], + "ImFontAtlas_GetGlyphRangesVietnamese": [ + { + "args": "(ImFontAtlas* self)", + "argsT": [ + { + "name": "self", + "type": "ImFontAtlas*" + } + ], + "argsoriginal": "()", + "call_args": "()", + "cimguiname": "ImFontAtlas_GetGlyphRangesVietnamese", + "defaults": [], + "funcname": "GetGlyphRangesVietnamese", + "ov_cimguiname": "ImFontAtlas_GetGlyphRangesVietnamese", + "ret": "const ImWchar*", + "signature": "()", + "stname": "ImFontAtlas" + } + ], "ImFontAtlas_GetMouseCursorTexData": [ { "args": "(ImFontAtlas* self,ImGuiMouseCursor cursor,ImVec2* out_offset,ImVec2* out_size,ImVec2 out_uv_border[2],ImVec2 out_uv_fill[2])", @@ -19442,6 +19462,22 @@ "stname": "" } ], + "igGetBackgroundDrawList": [ + { + "args": "()", + "argsT": [], + "argsoriginal": "()", + "call_args": "()", + "cimguiname": "igGetBackgroundDrawList", + "defaults": [], + "funcname": "GetBackgroundDrawList", + "namespace": "ImGui", + "ov_cimguiname": "igGetBackgroundDrawList", + "ret": "ImDrawList*", + "signature": "()", + "stname": "" + } + ], "igGetClipboardText": [ { "args": "()", @@ -20057,6 +20093,22 @@ "stname": "" } ], + "igGetForegroundDrawList": [ + { + "args": "()", + "argsT": [], + "argsoriginal": "()", + "call_args": "()", + "cimguiname": "igGetForegroundDrawList", + "defaults": [], + "funcname": "GetForegroundDrawList", + "namespace": "ImGui", + "ov_cimguiname": "igGetForegroundDrawList", + "ret": "ImDrawList*", + "signature": "()", + "stname": "" + } + ], "igGetFrameCount": [ { "args": "()", @@ -20598,22 +20650,6 @@ "stname": "" } ], - "igGetOverlayDrawList": [ - { - "args": "()", - "argsT": [], - "argsoriginal": "()", - "call_args": "()", - "cimguiname": "igGetOverlayDrawList", - "defaults": [], - "funcname": "GetOverlayDrawList", - "namespace": "ImGui", - "ov_cimguiname": "igGetOverlayDrawList", - "ret": "ImDrawList*", - "signature": "()", - "stname": "" - } - ], "igGetScrollMaxX": [ { "args": "()", @@ -21759,6 +21795,55 @@ "stname": "" } ], + "igInputTextWithHint": [ + { + "args": "(const char* label,const char* hint,char* buf,size_t buf_size,ImGuiInputTextFlags flags,ImGuiInputTextCallback callback,void* user_data)", + "argsT": [ + { + "name": "label", + "type": "const char*" + }, + { + "name": "hint", + "type": "const char*" + }, + { + "name": "buf", + "type": "char*" + }, + { + "name": "buf_size", + "type": "size_t" + }, + { + "name": "flags", + "type": "ImGuiInputTextFlags" + }, + { + "name": "callback", + "type": "ImGuiInputTextCallback" + }, + { + "name": "user_data", + "type": "void*" + } + ], + "argsoriginal": "(const char* label,const char* hint,char* buf,size_t buf_size,ImGuiInputTextFlags flags=0,ImGuiInputTextCallback callback=((void*)0),void* user_data=((void*)0))", + "call_args": "(label,hint,buf,buf_size,flags,callback,user_data)", + "cimguiname": "igInputTextWithHint", + "defaults": { + "callback": "((void*)0)", + "flags": "0", + "user_data": "((void*)0)" + }, + "funcname": "InputTextWithHint", + "namespace": "ImGui", + "ov_cimguiname": "igInputTextWithHint", + "ret": "bool", + "signature": "(const char*,const char*,char*,size_t,ImGuiInputTextFlags,ImGuiInputTextCallback,void*)", + "stname": "" + } + ], "igInvisibleButton": [ { "args": "(const char* str_id,const ImVec2 size)", @@ -22712,18 +22797,18 @@ ], "igLogToClipboard": [ { - "args": "(int max_depth)", + "args": "(int auto_open_depth)", "argsT": [ { - "name": "max_depth", + "name": "auto_open_depth", "type": "int" } ], - "argsoriginal": "(int max_depth=-1)", - "call_args": "(max_depth)", + "argsoriginal": "(int auto_open_depth=-1)", + "call_args": "(auto_open_depth)", "cimguiname": "igLogToClipboard", "defaults": { - "max_depth": "-1" + "auto_open_depth": "-1" }, "funcname": "LogToClipboard", "namespace": "ImGui", @@ -22735,10 +22820,10 @@ ], "igLogToFile": [ { - "args": "(int max_depth,const char* filename)", + "args": "(int auto_open_depth,const char* filename)", "argsT": [ { - "name": "max_depth", + "name": "auto_open_depth", "type": "int" }, { @@ -22746,12 +22831,12 @@ "type": "const char*" } ], - "argsoriginal": "(int max_depth=-1,const char* filename=((void*)0))", - "call_args": "(max_depth,filename)", + "argsoriginal": "(int auto_open_depth=-1,const char* filename=((void*)0))", + "call_args": "(auto_open_depth,filename)", "cimguiname": "igLogToFile", "defaults": { - "filename": "((void*)0)", - "max_depth": "-1" + "auto_open_depth": "-1", + "filename": "((void*)0)" }, "funcname": "LogToFile", "namespace": "ImGui", @@ -22763,18 +22848,18 @@ ], "igLogToTTY": [ { - "args": "(int max_depth)", + "args": "(int auto_open_depth)", "argsT": [ { - "name": "max_depth", + "name": "auto_open_depth", "type": "int" } ], - "argsoriginal": "(int max_depth=-1)", - "call_args": "(max_depth)", + "argsoriginal": "(int auto_open_depth=-1)", + "call_args": "(auto_open_depth)", "cimguiname": "igLogToTTY", "defaults": { - "max_depth": "-1" + "auto_open_depth": "-1" }, "funcname": "LogToTTY", "namespace": "ImGui", @@ -24219,7 +24304,7 @@ ], "igSetDragDropPayload": [ { - "args": "(const char* type,const void* data,size_t size,ImGuiCond cond)", + "args": "(const char* type,const void* data,size_t sz,ImGuiCond cond)", "argsT": [ { "name": "type", @@ -24230,7 +24315,7 @@ "type": "const void*" }, { - "name": "size", + "name": "sz", "type": "size_t" }, { @@ -24238,8 +24323,8 @@ "type": "ImGuiCond" } ], - "argsoriginal": "(const char* type,const void* data,size_t size,ImGuiCond cond=0)", - "call_args": "(type,data,size,cond)", + "argsoriginal": "(const char* type,const void* data,size_t sz,ImGuiCond cond=0)", + "call_args": "(type,data,sz,cond)", "cimguiname": "igSetDragDropPayload", "defaults": { "cond": "0" diff --git a/generator/output/definitions.lua b/generator/output/definitions.lua index 9052450..7763d87 100644 --- a/generator/output/definitions.lua +++ b/generator/output/definitions.lua @@ -524,7 +524,7 @@ defs["ImDrawList_AddCircleFilled"][1]["stname"] = "ImDrawList" defs["ImDrawList_AddCircleFilled"]["(const ImVec2,float,ImU32,int)"] = defs["ImDrawList_AddCircleFilled"][1] defs["ImDrawList_AddConvexPolyFilled"] = {} defs["ImDrawList_AddConvexPolyFilled"][1] = {} -defs["ImDrawList_AddConvexPolyFilled"][1]["args"] = "(ImDrawList* self,const ImVec2* points,const int num_points,ImU32 col)" +defs["ImDrawList_AddConvexPolyFilled"][1]["args"] = "(ImDrawList* self,const ImVec2* points,int num_points,ImU32 col)" defs["ImDrawList_AddConvexPolyFilled"][1]["argsT"] = {} defs["ImDrawList_AddConvexPolyFilled"][1]["argsT"][1] = {} defs["ImDrawList_AddConvexPolyFilled"][1]["argsT"][1]["name"] = "self" @@ -534,20 +534,20 @@ defs["ImDrawList_AddConvexPolyFilled"][1]["argsT"][2]["name"] = "points" defs["ImDrawList_AddConvexPolyFilled"][1]["argsT"][2]["type"] = "const ImVec2*" defs["ImDrawList_AddConvexPolyFilled"][1]["argsT"][3] = {} defs["ImDrawList_AddConvexPolyFilled"][1]["argsT"][3]["name"] = "num_points" -defs["ImDrawList_AddConvexPolyFilled"][1]["argsT"][3]["type"] = "const int" +defs["ImDrawList_AddConvexPolyFilled"][1]["argsT"][3]["type"] = "int" defs["ImDrawList_AddConvexPolyFilled"][1]["argsT"][4] = {} defs["ImDrawList_AddConvexPolyFilled"][1]["argsT"][4]["name"] = "col" defs["ImDrawList_AddConvexPolyFilled"][1]["argsT"][4]["type"] = "ImU32" -defs["ImDrawList_AddConvexPolyFilled"][1]["argsoriginal"] = "(const ImVec2* points,const int num_points,ImU32 col)" +defs["ImDrawList_AddConvexPolyFilled"][1]["argsoriginal"] = "(const ImVec2* points,int num_points,ImU32 col)" defs["ImDrawList_AddConvexPolyFilled"][1]["call_args"] = "(points,num_points,col)" defs["ImDrawList_AddConvexPolyFilled"][1]["cimguiname"] = "ImDrawList_AddConvexPolyFilled" defs["ImDrawList_AddConvexPolyFilled"][1]["defaults"] = {} defs["ImDrawList_AddConvexPolyFilled"][1]["funcname"] = "AddConvexPolyFilled" defs["ImDrawList_AddConvexPolyFilled"][1]["ov_cimguiname"] = "ImDrawList_AddConvexPolyFilled" defs["ImDrawList_AddConvexPolyFilled"][1]["ret"] = "void" -defs["ImDrawList_AddConvexPolyFilled"][1]["signature"] = "(const ImVec2*,const int,ImU32)" +defs["ImDrawList_AddConvexPolyFilled"][1]["signature"] = "(const ImVec2*,int,ImU32)" defs["ImDrawList_AddConvexPolyFilled"][1]["stname"] = "ImDrawList" -defs["ImDrawList_AddConvexPolyFilled"]["(const ImVec2*,const int,ImU32)"] = defs["ImDrawList_AddConvexPolyFilled"][1] +defs["ImDrawList_AddConvexPolyFilled"]["(const ImVec2*,int,ImU32)"] = defs["ImDrawList_AddConvexPolyFilled"][1] defs["ImDrawList_AddDrawCmd"] = {} defs["ImDrawList_AddDrawCmd"][1] = {} defs["ImDrawList_AddDrawCmd"][1]["args"] = "(ImDrawList* self)" @@ -729,7 +729,7 @@ defs["ImDrawList_AddLine"][1]["stname"] = "ImDrawList" defs["ImDrawList_AddLine"]["(const ImVec2,const ImVec2,ImU32,float)"] = defs["ImDrawList_AddLine"][1] defs["ImDrawList_AddPolyline"] = {} defs["ImDrawList_AddPolyline"][1] = {} -defs["ImDrawList_AddPolyline"][1]["args"] = "(ImDrawList* self,const ImVec2* points,const int num_points,ImU32 col,bool closed,float thickness)" +defs["ImDrawList_AddPolyline"][1]["args"] = "(ImDrawList* self,const ImVec2* points,int num_points,ImU32 col,bool closed,float thickness)" defs["ImDrawList_AddPolyline"][1]["argsT"] = {} defs["ImDrawList_AddPolyline"][1]["argsT"][1] = {} defs["ImDrawList_AddPolyline"][1]["argsT"][1]["name"] = "self" @@ -739,7 +739,7 @@ defs["ImDrawList_AddPolyline"][1]["argsT"][2]["name"] = "points" defs["ImDrawList_AddPolyline"][1]["argsT"][2]["type"] = "const ImVec2*" defs["ImDrawList_AddPolyline"][1]["argsT"][3] = {} defs["ImDrawList_AddPolyline"][1]["argsT"][3]["name"] = "num_points" -defs["ImDrawList_AddPolyline"][1]["argsT"][3]["type"] = "const int" +defs["ImDrawList_AddPolyline"][1]["argsT"][3]["type"] = "int" defs["ImDrawList_AddPolyline"][1]["argsT"][4] = {} defs["ImDrawList_AddPolyline"][1]["argsT"][4]["name"] = "col" defs["ImDrawList_AddPolyline"][1]["argsT"][4]["type"] = "ImU32" @@ -749,16 +749,16 @@ defs["ImDrawList_AddPolyline"][1]["argsT"][5]["type"] = "bool" defs["ImDrawList_AddPolyline"][1]["argsT"][6] = {} defs["ImDrawList_AddPolyline"][1]["argsT"][6]["name"] = "thickness" defs["ImDrawList_AddPolyline"][1]["argsT"][6]["type"] = "float" -defs["ImDrawList_AddPolyline"][1]["argsoriginal"] = "(const ImVec2* points,const int num_points,ImU32 col,bool closed,float thickness)" +defs["ImDrawList_AddPolyline"][1]["argsoriginal"] = "(const ImVec2* points,int num_points,ImU32 col,bool closed,float thickness)" defs["ImDrawList_AddPolyline"][1]["call_args"] = "(points,num_points,col,closed,thickness)" defs["ImDrawList_AddPolyline"][1]["cimguiname"] = "ImDrawList_AddPolyline" defs["ImDrawList_AddPolyline"][1]["defaults"] = {} defs["ImDrawList_AddPolyline"][1]["funcname"] = "AddPolyline" defs["ImDrawList_AddPolyline"][1]["ov_cimguiname"] = "ImDrawList_AddPolyline" defs["ImDrawList_AddPolyline"][1]["ret"] = "void" -defs["ImDrawList_AddPolyline"][1]["signature"] = "(const ImVec2*,const int,ImU32,bool,float)" +defs["ImDrawList_AddPolyline"][1]["signature"] = "(const ImVec2*,int,ImU32,bool,float)" defs["ImDrawList_AddPolyline"][1]["stname"] = "ImDrawList" -defs["ImDrawList_AddPolyline"]["(const ImVec2*,const int,ImU32,bool,float)"] = defs["ImDrawList_AddPolyline"][1] +defs["ImDrawList_AddPolyline"]["(const ImVec2*,int,ImU32,bool,float)"] = defs["ImDrawList_AddPolyline"][1] defs["ImDrawList_AddQuad"] = {} defs["ImDrawList_AddQuad"][1] = {} defs["ImDrawList_AddQuad"][1]["args"] = "(ImDrawList* self,const ImVec2 a,const ImVec2 b,const ImVec2 c,const ImVec2 d,ImU32 col,float thickness)" @@ -2359,6 +2359,23 @@ defs["ImFontAtlas_GetGlyphRangesThai"][1]["ret"] = "const ImWchar*" defs["ImFontAtlas_GetGlyphRangesThai"][1]["signature"] = "()" defs["ImFontAtlas_GetGlyphRangesThai"][1]["stname"] = "ImFontAtlas" defs["ImFontAtlas_GetGlyphRangesThai"]["()"] = defs["ImFontAtlas_GetGlyphRangesThai"][1] +defs["ImFontAtlas_GetGlyphRangesVietnamese"] = {} +defs["ImFontAtlas_GetGlyphRangesVietnamese"][1] = {} +defs["ImFontAtlas_GetGlyphRangesVietnamese"][1]["args"] = "(ImFontAtlas* self)" +defs["ImFontAtlas_GetGlyphRangesVietnamese"][1]["argsT"] = {} +defs["ImFontAtlas_GetGlyphRangesVietnamese"][1]["argsT"][1] = {} +defs["ImFontAtlas_GetGlyphRangesVietnamese"][1]["argsT"][1]["name"] = "self" +defs["ImFontAtlas_GetGlyphRangesVietnamese"][1]["argsT"][1]["type"] = "ImFontAtlas*" +defs["ImFontAtlas_GetGlyphRangesVietnamese"][1]["argsoriginal"] = "()" +defs["ImFontAtlas_GetGlyphRangesVietnamese"][1]["call_args"] = "()" +defs["ImFontAtlas_GetGlyphRangesVietnamese"][1]["cimguiname"] = "ImFontAtlas_GetGlyphRangesVietnamese" +defs["ImFontAtlas_GetGlyphRangesVietnamese"][1]["defaults"] = {} +defs["ImFontAtlas_GetGlyphRangesVietnamese"][1]["funcname"] = "GetGlyphRangesVietnamese" +defs["ImFontAtlas_GetGlyphRangesVietnamese"][1]["ov_cimguiname"] = "ImFontAtlas_GetGlyphRangesVietnamese" +defs["ImFontAtlas_GetGlyphRangesVietnamese"][1]["ret"] = "const ImWchar*" +defs["ImFontAtlas_GetGlyphRangesVietnamese"][1]["signature"] = "()" +defs["ImFontAtlas_GetGlyphRangesVietnamese"][1]["stname"] = "ImFontAtlas" +defs["ImFontAtlas_GetGlyphRangesVietnamese"]["()"] = defs["ImFontAtlas_GetGlyphRangesVietnamese"][1] defs["ImFontAtlas_GetMouseCursorTexData"] = {} defs["ImFontAtlas_GetMouseCursorTexData"][1] = {} defs["ImFontAtlas_GetMouseCursorTexData"][1]["args"] = "(ImFontAtlas* self,ImGuiMouseCursor cursor,ImVec2* out_offset,ImVec2* out_size,ImVec2 out_uv_border[2],ImVec2 out_uv_fill[2])" @@ -16349,6 +16366,21 @@ defs["igEndTooltip"][1]["ret"] = "void" defs["igEndTooltip"][1]["signature"] = "()" defs["igEndTooltip"][1]["stname"] = "" defs["igEndTooltip"]["()"] = defs["igEndTooltip"][1] +defs["igGetBackgroundDrawList"] = {} +defs["igGetBackgroundDrawList"][1] = {} +defs["igGetBackgroundDrawList"][1]["args"] = "()" +defs["igGetBackgroundDrawList"][1]["argsT"] = {} +defs["igGetBackgroundDrawList"][1]["argsoriginal"] = "()" +defs["igGetBackgroundDrawList"][1]["call_args"] = "()" +defs["igGetBackgroundDrawList"][1]["cimguiname"] = "igGetBackgroundDrawList" +defs["igGetBackgroundDrawList"][1]["defaults"] = {} +defs["igGetBackgroundDrawList"][1]["funcname"] = "GetBackgroundDrawList" +defs["igGetBackgroundDrawList"][1]["namespace"] = "ImGui" +defs["igGetBackgroundDrawList"][1]["ov_cimguiname"] = "igGetBackgroundDrawList" +defs["igGetBackgroundDrawList"][1]["ret"] = "ImDrawList*" +defs["igGetBackgroundDrawList"][1]["signature"] = "()" +defs["igGetBackgroundDrawList"][1]["stname"] = "" +defs["igGetBackgroundDrawList"]["()"] = defs["igGetBackgroundDrawList"][1] defs["igGetClipboardText"] = {} defs["igGetClipboardText"][1] = {} defs["igGetClipboardText"][1]["args"] = "()" @@ -16917,6 +16949,21 @@ defs["igGetFontTexUvWhitePixel"][3]["stname"] = "" defs["igGetFontTexUvWhitePixel"]["()"] = defs["igGetFontTexUvWhitePixel"][1] defs["igGetFontTexUvWhitePixel"]["()nonUDT"] = defs["igGetFontTexUvWhitePixel"][2] defs["igGetFontTexUvWhitePixel"]["()nonUDT2"] = defs["igGetFontTexUvWhitePixel"][3] +defs["igGetForegroundDrawList"] = {} +defs["igGetForegroundDrawList"][1] = {} +defs["igGetForegroundDrawList"][1]["args"] = "()" +defs["igGetForegroundDrawList"][1]["argsT"] = {} +defs["igGetForegroundDrawList"][1]["argsoriginal"] = "()" +defs["igGetForegroundDrawList"][1]["call_args"] = "()" +defs["igGetForegroundDrawList"][1]["cimguiname"] = "igGetForegroundDrawList" +defs["igGetForegroundDrawList"][1]["defaults"] = {} +defs["igGetForegroundDrawList"][1]["funcname"] = "GetForegroundDrawList" +defs["igGetForegroundDrawList"][1]["namespace"] = "ImGui" +defs["igGetForegroundDrawList"][1]["ov_cimguiname"] = "igGetForegroundDrawList" +defs["igGetForegroundDrawList"][1]["ret"] = "ImDrawList*" +defs["igGetForegroundDrawList"][1]["signature"] = "()" +defs["igGetForegroundDrawList"][1]["stname"] = "" +defs["igGetForegroundDrawList"]["()"] = defs["igGetForegroundDrawList"][1] defs["igGetFrameCount"] = {} defs["igGetFrameCount"][1] = {} defs["igGetFrameCount"][1]["args"] = "()" @@ -17404,21 +17451,6 @@ defs["igGetMousePosOnOpeningCurrentPopup"][3]["stname"] = "" defs["igGetMousePosOnOpeningCurrentPopup"]["()"] = defs["igGetMousePosOnOpeningCurrentPopup"][1] defs["igGetMousePosOnOpeningCurrentPopup"]["()nonUDT"] = defs["igGetMousePosOnOpeningCurrentPopup"][2] defs["igGetMousePosOnOpeningCurrentPopup"]["()nonUDT2"] = defs["igGetMousePosOnOpeningCurrentPopup"][3] -defs["igGetOverlayDrawList"] = {} -defs["igGetOverlayDrawList"][1] = {} -defs["igGetOverlayDrawList"][1]["args"] = "()" -defs["igGetOverlayDrawList"][1]["argsT"] = {} -defs["igGetOverlayDrawList"][1]["argsoriginal"] = "()" -defs["igGetOverlayDrawList"][1]["call_args"] = "()" -defs["igGetOverlayDrawList"][1]["cimguiname"] = "igGetOverlayDrawList" -defs["igGetOverlayDrawList"][1]["defaults"] = {} -defs["igGetOverlayDrawList"][1]["funcname"] = "GetOverlayDrawList" -defs["igGetOverlayDrawList"][1]["namespace"] = "ImGui" -defs["igGetOverlayDrawList"][1]["ov_cimguiname"] = "igGetOverlayDrawList" -defs["igGetOverlayDrawList"][1]["ret"] = "ImDrawList*" -defs["igGetOverlayDrawList"][1]["signature"] = "()" -defs["igGetOverlayDrawList"][1]["stname"] = "" -defs["igGetOverlayDrawList"]["()"] = defs["igGetOverlayDrawList"][1] defs["igGetScrollMaxX"] = {} defs["igGetScrollMaxX"][1] = {} defs["igGetScrollMaxX"][1]["args"] = "()" @@ -18403,6 +18435,45 @@ defs["igInputTextMultiline"][1]["ret"] = "bool" defs["igInputTextMultiline"][1]["signature"] = "(const char*,char*,size_t,const ImVec2,ImGuiInputTextFlags,ImGuiInputTextCallback,void*)" defs["igInputTextMultiline"][1]["stname"] = "" defs["igInputTextMultiline"]["(const char*,char*,size_t,const ImVec2,ImGuiInputTextFlags,ImGuiInputTextCallback,void*)"] = defs["igInputTextMultiline"][1] +defs["igInputTextWithHint"] = {} +defs["igInputTextWithHint"][1] = {} +defs["igInputTextWithHint"][1]["args"] = "(const char* label,const char* hint,char* buf,size_t buf_size,ImGuiInputTextFlags flags,ImGuiInputTextCallback callback,void* user_data)" +defs["igInputTextWithHint"][1]["argsT"] = {} +defs["igInputTextWithHint"][1]["argsT"][1] = {} +defs["igInputTextWithHint"][1]["argsT"][1]["name"] = "label" +defs["igInputTextWithHint"][1]["argsT"][1]["type"] = "const char*" +defs["igInputTextWithHint"][1]["argsT"][2] = {} +defs["igInputTextWithHint"][1]["argsT"][2]["name"] = "hint" +defs["igInputTextWithHint"][1]["argsT"][2]["type"] = "const char*" +defs["igInputTextWithHint"][1]["argsT"][3] = {} +defs["igInputTextWithHint"][1]["argsT"][3]["name"] = "buf" +defs["igInputTextWithHint"][1]["argsT"][3]["type"] = "char*" +defs["igInputTextWithHint"][1]["argsT"][4] = {} +defs["igInputTextWithHint"][1]["argsT"][4]["name"] = "buf_size" +defs["igInputTextWithHint"][1]["argsT"][4]["type"] = "size_t" +defs["igInputTextWithHint"][1]["argsT"][5] = {} +defs["igInputTextWithHint"][1]["argsT"][5]["name"] = "flags" +defs["igInputTextWithHint"][1]["argsT"][5]["type"] = "ImGuiInputTextFlags" +defs["igInputTextWithHint"][1]["argsT"][6] = {} +defs["igInputTextWithHint"][1]["argsT"][6]["name"] = "callback" +defs["igInputTextWithHint"][1]["argsT"][6]["type"] = "ImGuiInputTextCallback" +defs["igInputTextWithHint"][1]["argsT"][7] = {} +defs["igInputTextWithHint"][1]["argsT"][7]["name"] = "user_data" +defs["igInputTextWithHint"][1]["argsT"][7]["type"] = "void*" +defs["igInputTextWithHint"][1]["argsoriginal"] = "(const char* label,const char* hint,char* buf,size_t buf_size,ImGuiInputTextFlags flags=0,ImGuiInputTextCallback callback=((void*)0),void* user_data=((void*)0))" +defs["igInputTextWithHint"][1]["call_args"] = "(label,hint,buf,buf_size,flags,callback,user_data)" +defs["igInputTextWithHint"][1]["cimguiname"] = "igInputTextWithHint" +defs["igInputTextWithHint"][1]["defaults"] = {} +defs["igInputTextWithHint"][1]["defaults"]["callback"] = "((void*)0)" +defs["igInputTextWithHint"][1]["defaults"]["flags"] = "0" +defs["igInputTextWithHint"][1]["defaults"]["user_data"] = "((void*)0)" +defs["igInputTextWithHint"][1]["funcname"] = "InputTextWithHint" +defs["igInputTextWithHint"][1]["namespace"] = "ImGui" +defs["igInputTextWithHint"][1]["ov_cimguiname"] = "igInputTextWithHint" +defs["igInputTextWithHint"][1]["ret"] = "bool" +defs["igInputTextWithHint"][1]["signature"] = "(const char*,const char*,char*,size_t,ImGuiInputTextFlags,ImGuiInputTextCallback,void*)" +defs["igInputTextWithHint"][1]["stname"] = "" +defs["igInputTextWithHint"]["(const char*,const char*,char*,size_t,ImGuiInputTextFlags,ImGuiInputTextCallback,void*)"] = defs["igInputTextWithHint"][1] defs["igInvisibleButton"] = {} defs["igInvisibleButton"][1] = {} defs["igInvisibleButton"][1]["args"] = "(const char* str_id,const ImVec2 size)" @@ -19223,16 +19294,16 @@ defs["igLogText"][1]["stname"] = "" defs["igLogText"]["(const char*,...)"] = defs["igLogText"][1] defs["igLogToClipboard"] = {} defs["igLogToClipboard"][1] = {} -defs["igLogToClipboard"][1]["args"] = "(int max_depth)" +defs["igLogToClipboard"][1]["args"] = "(int auto_open_depth)" defs["igLogToClipboard"][1]["argsT"] = {} defs["igLogToClipboard"][1]["argsT"][1] = {} -defs["igLogToClipboard"][1]["argsT"][1]["name"] = "max_depth" +defs["igLogToClipboard"][1]["argsT"][1]["name"] = "auto_open_depth" defs["igLogToClipboard"][1]["argsT"][1]["type"] = "int" -defs["igLogToClipboard"][1]["argsoriginal"] = "(int max_depth=-1)" -defs["igLogToClipboard"][1]["call_args"] = "(max_depth)" +defs["igLogToClipboard"][1]["argsoriginal"] = "(int auto_open_depth=-1)" +defs["igLogToClipboard"][1]["call_args"] = "(auto_open_depth)" defs["igLogToClipboard"][1]["cimguiname"] = "igLogToClipboard" defs["igLogToClipboard"][1]["defaults"] = {} -defs["igLogToClipboard"][1]["defaults"]["max_depth"] = "-1" +defs["igLogToClipboard"][1]["defaults"]["auto_open_depth"] = "-1" defs["igLogToClipboard"][1]["funcname"] = "LogToClipboard" defs["igLogToClipboard"][1]["namespace"] = "ImGui" defs["igLogToClipboard"][1]["ov_cimguiname"] = "igLogToClipboard" @@ -19242,20 +19313,20 @@ defs["igLogToClipboard"][1]["stname"] = "" defs["igLogToClipboard"]["(int)"] = defs["igLogToClipboard"][1] defs["igLogToFile"] = {} defs["igLogToFile"][1] = {} -defs["igLogToFile"][1]["args"] = "(int max_depth,const char* filename)" +defs["igLogToFile"][1]["args"] = "(int auto_open_depth,const char* filename)" defs["igLogToFile"][1]["argsT"] = {} defs["igLogToFile"][1]["argsT"][1] = {} -defs["igLogToFile"][1]["argsT"][1]["name"] = "max_depth" +defs["igLogToFile"][1]["argsT"][1]["name"] = "auto_open_depth" defs["igLogToFile"][1]["argsT"][1]["type"] = "int" defs["igLogToFile"][1]["argsT"][2] = {} defs["igLogToFile"][1]["argsT"][2]["name"] = "filename" defs["igLogToFile"][1]["argsT"][2]["type"] = "const char*" -defs["igLogToFile"][1]["argsoriginal"] = "(int max_depth=-1,const char* filename=((void*)0))" -defs["igLogToFile"][1]["call_args"] = "(max_depth,filename)" +defs["igLogToFile"][1]["argsoriginal"] = "(int auto_open_depth=-1,const char* filename=((void*)0))" +defs["igLogToFile"][1]["call_args"] = "(auto_open_depth,filename)" defs["igLogToFile"][1]["cimguiname"] = "igLogToFile" defs["igLogToFile"][1]["defaults"] = {} +defs["igLogToFile"][1]["defaults"]["auto_open_depth"] = "-1" defs["igLogToFile"][1]["defaults"]["filename"] = "((void*)0)" -defs["igLogToFile"][1]["defaults"]["max_depth"] = "-1" defs["igLogToFile"][1]["funcname"] = "LogToFile" defs["igLogToFile"][1]["namespace"] = "ImGui" defs["igLogToFile"][1]["ov_cimguiname"] = "igLogToFile" @@ -19265,16 +19336,16 @@ defs["igLogToFile"][1]["stname"] = "" defs["igLogToFile"]["(int,const char*)"] = defs["igLogToFile"][1] defs["igLogToTTY"] = {} defs["igLogToTTY"][1] = {} -defs["igLogToTTY"][1]["args"] = "(int max_depth)" +defs["igLogToTTY"][1]["args"] = "(int auto_open_depth)" defs["igLogToTTY"][1]["argsT"] = {} defs["igLogToTTY"][1]["argsT"][1] = {} -defs["igLogToTTY"][1]["argsT"][1]["name"] = "max_depth" +defs["igLogToTTY"][1]["argsT"][1]["name"] = "auto_open_depth" defs["igLogToTTY"][1]["argsT"][1]["type"] = "int" -defs["igLogToTTY"][1]["argsoriginal"] = "(int max_depth=-1)" -defs["igLogToTTY"][1]["call_args"] = "(max_depth)" +defs["igLogToTTY"][1]["argsoriginal"] = "(int auto_open_depth=-1)" +defs["igLogToTTY"][1]["call_args"] = "(auto_open_depth)" defs["igLogToTTY"][1]["cimguiname"] = "igLogToTTY" defs["igLogToTTY"][1]["defaults"] = {} -defs["igLogToTTY"][1]["defaults"]["max_depth"] = "-1" +defs["igLogToTTY"][1]["defaults"]["auto_open_depth"] = "-1" defs["igLogToTTY"][1]["funcname"] = "LogToTTY" defs["igLogToTTY"][1]["namespace"] = "ImGui" defs["igLogToTTY"][1]["ov_cimguiname"] = "igLogToTTY" @@ -20501,7 +20572,7 @@ defs["igSetCursorScreenPos"][1]["stname"] = "" defs["igSetCursorScreenPos"]["(const ImVec2)"] = defs["igSetCursorScreenPos"][1] defs["igSetDragDropPayload"] = {} defs["igSetDragDropPayload"][1] = {} -defs["igSetDragDropPayload"][1]["args"] = "(const char* type,const void* data,size_t size,ImGuiCond cond)" +defs["igSetDragDropPayload"][1]["args"] = "(const char* type,const void* data,size_t sz,ImGuiCond cond)" defs["igSetDragDropPayload"][1]["argsT"] = {} defs["igSetDragDropPayload"][1]["argsT"][1] = {} defs["igSetDragDropPayload"][1]["argsT"][1]["name"] = "type" @@ -20510,13 +20581,13 @@ defs["igSetDragDropPayload"][1]["argsT"][2] = {} defs["igSetDragDropPayload"][1]["argsT"][2]["name"] = "data" defs["igSetDragDropPayload"][1]["argsT"][2]["type"] = "const void*" defs["igSetDragDropPayload"][1]["argsT"][3] = {} -defs["igSetDragDropPayload"][1]["argsT"][3]["name"] = "size" +defs["igSetDragDropPayload"][1]["argsT"][3]["name"] = "sz" defs["igSetDragDropPayload"][1]["argsT"][3]["type"] = "size_t" defs["igSetDragDropPayload"][1]["argsT"][4] = {} defs["igSetDragDropPayload"][1]["argsT"][4]["name"] = "cond" defs["igSetDragDropPayload"][1]["argsT"][4]["type"] = "ImGuiCond" -defs["igSetDragDropPayload"][1]["argsoriginal"] = "(const char* type,const void* data,size_t size,ImGuiCond cond=0)" -defs["igSetDragDropPayload"][1]["call_args"] = "(type,data,size,cond)" +defs["igSetDragDropPayload"][1]["argsoriginal"] = "(const char* type,const void* data,size_t sz,ImGuiCond cond=0)" +defs["igSetDragDropPayload"][1]["call_args"] = "(type,data,sz,cond)" defs["igSetDragDropPayload"][1]["cimguiname"] = "igSetDragDropPayload" defs["igSetDragDropPayload"][1]["defaults"] = {} defs["igSetDragDropPayload"][1]["defaults"]["cond"] = "0" diff --git a/generator/output/overloads.txt b/generator/output/overloads.txt index 84a19f2..87ccf60 100644 --- a/generator/output/overloads.txt +++ b/generator/output/overloads.txt @@ -1,131 +1,131 @@ ----------------overloadings--------------------------- -igCombo 3 -1 bool igCombo (const char*,int*,const char* const[],int,int) -2 bool igComboStr (const char*,int*,const char*,int) -3 bool igComboFnPtr (const char*,int*,bool(*)(void*,int,const char**),void*,int,int) -TextRange_TextRange 2 -1 nil TextRange_TextRange () -2 nil TextRange_TextRangeStr (const char*,const char*) +ImVector_resize 2 +1 void ImVector_resize (int) +2 void ImVector_resizeT (int,const T) ImVec4_ImVec4 2 1 nil ImVec4_ImVec4 () 2 nil ImVec4_ImVec4Float (float,float,float,float) -igSetWindowFocus 2 -1 void igSetWindowFocus () -2 void igSetWindowFocusStr (const char*) igValue 4 1 void igValueBool (const char*,bool) 2 void igValueInt (const char*,int) 3 void igValueUint (const char*,unsigned int) 4 void igValueFloat (const char*,float,const char*) -igPushStyleVar 2 -1 void igPushStyleVarFloat (ImGuiStyleVar,float) -2 void igPushStyleVarVec2 (ImGuiStyleVar,const ImVec2) -ImVector_end 2 -1 T* ImVector_end () -2 const T* ImVector_end_const ()const igIsRectVisible 2 1 bool igIsRectVisible (const ImVec2) 2 bool igIsRectVisibleVec2 (const ImVec2,const ImVec2) igRadioButton 2 1 bool igRadioButtonBool (const char*,bool) 2 bool igRadioButtonIntPtr (const char*,int*,int) -igSetWindowSize 2 -1 void igSetWindowSizeVec2 (const ImVec2,ImGuiCond) -2 void igSetWindowSizeStr (const char*,const ImVec2,ImGuiCond) -ImVector_ImVector 2 -1 nil ImVector_ImVector () -2 nil ImVector_ImVectorVector (const ImVector) -igSetWindowCollapsed 2 -1 void igSetWindowCollapsedBool (bool,ImGuiCond) -2 void igSetWindowCollapsedStr (const char*,bool,ImGuiCond) -igPlotLines 2 -1 void igPlotLines (const char*,const float*,int,int,const char*,float,float,ImVec2,int) -2 void igPlotLinesFnPtr (const char*,float(*)(void*,int),void*,int,int,const char*,float,float,ImVec2) -ImVec2_ImVec2 2 -1 nil ImVec2_ImVec2 () -2 nil ImVec2_ImVec2Float (float,float) ImVector_back 2 1 T* ImVector_back () 2 const T* ImVector_back_const ()const igPlotHistogram 2 1 void igPlotHistogramFloatPtr (const char*,const float*,int,int,const char*,float,float,ImVec2,int) 2 void igPlotHistogramFnPtr (const char*,float(*)(void*,int),void*,int,int,const char*,float,float,ImVec2) -igTreeNodeExV 2 -1 bool igTreeNodeExVStr (const char*,ImGuiTreeNodeFlags,const char*,va_list) -2 bool igTreeNodeExVPtr (const void*,ImGuiTreeNodeFlags,const char*,va_list) igGetID 3 1 ImGuiID igGetIDStr (const char*) 2 ImGuiID igGetIDRange (const char*,const char*) 3 ImGuiID igGetIDPtr (const void*) -ImDrawList_AddText 2 -1 void ImDrawList_AddText (const ImVec2,ImU32,const char*,const char*) -2 void ImDrawList_AddTextFontPtr (const ImFont*,float,const ImVec2,ImU32,const char*,const char*,float,const ImVec4*) -ImVector_begin 2 -1 T* ImVector_begin () -2 const T* ImVector_begin_const ()const +igSetWindowPos 2 +1 void igSetWindowPosVec2 (const ImVec2,ImGuiCond) +2 void igSetWindowPosStr (const char*,const ImVec2,ImGuiCond) igBeginChild 2 1 bool igBeginChild (const char*,const ImVec2,bool,ImGuiWindowFlags) 2 bool igBeginChildID (ImGuiID,const ImVec2,bool,ImGuiWindowFlags) -igPushStyleColor 2 -1 void igPushStyleColorU32 (ImGuiCol,ImU32) -2 void igPushStyleColor (ImGuiCol,const ImVec4) -igSelectable 2 -1 bool igSelectable (const char*,bool,ImGuiSelectableFlags,const ImVec2) -2 bool igSelectableBoolPtr (const char*,bool*,ImGuiSelectableFlags,const ImVec2) -igListBox 2 -1 bool igListBoxStr_arr (const char*,int*,const char* const[],int,int) -2 bool igListBoxFnPtr (const char*,int*,bool(*)(void*,int,const char**),void*,int,int) -Pair_Pair 3 -1 nil Pair_PairInt (ImGuiID,int) -2 nil Pair_PairFloat (ImGuiID,float) -3 nil Pair_PairPtr (ImGuiID,void*) igPushID 4 1 void igPushIDStr (const char*) 2 void igPushIDRange (const char*,const char*) 3 void igPushIDPtr (const void*) 4 void igPushIDInt (int) -igSetWindowPos 2 -1 void igSetWindowPosVec2 (const ImVec2,ImGuiCond) -2 void igSetWindowPosStr (const char*,const ImVec2,ImGuiCond) -igListBoxHeader 2 -1 bool igListBoxHeaderVec2 (const char*,const ImVec2) -2 bool igListBoxHeaderInt (const char*,int,int) +Pair_Pair 3 +1 nil Pair_PairInt (ImGuiID,int) +2 nil Pair_PairFloat (ImGuiID,float) +3 nil Pair_PairPtr (ImGuiID,void*) +TextRange_TextRange 2 +1 nil TextRange_TextRange () +2 nil TextRange_TextRangeStr (const char*,const char*) +igTreeNode 3 +1 bool igTreeNodeStr (const char*) +2 bool igTreeNodeStrStr (const char*,const char*,...) +3 bool igTreeNodePtr (const void*,const char*,...) +igCombo 3 +1 bool igCombo (const char*,int*,const char* const[],int,int) +2 bool igComboStr (const char*,int*,const char*,int) +3 bool igComboFnPtr (const char*,int*,bool(*)(void*,int,const char**),void*,int,int) ImVector_erase 2 1 T* ImVector_erase (const T*) 2 T* ImVector_eraseTPtr (const T*,const T*) -ImVector_resize 2 -1 void ImVector_resize (int) -2 void ImVector_resizeT (int,const T) -ImVector_front 2 -1 T* ImVector_front () -2 const T* ImVector_front_const ()const +ImDrawList_AddText 2 +1 void ImDrawList_AddText (const ImVec2,ImU32,const char*,const char*) +2 void ImDrawList_AddTextFontPtr (const ImFont*,float,const ImVec2,ImU32,const char*,const char*,float,const ImVec4*) +igPushStyleVar 2 +1 void igPushStyleVarFloat (ImGuiStyleVar,float) +2 void igPushStyleVarVec2 (ImGuiStyleVar,const ImVec2) +igSetWindowFocus 2 +1 void igSetWindowFocus () +2 void igSetWindowFocusStr (const char*) +ImVector_end 2 +1 T* ImVector_end () +2 const T* ImVector_end_const ()const +igSetWindowSize 2 +1 void igSetWindowSizeVec2 (const ImVec2,ImGuiCond) +2 void igSetWindowSizeStr (const char*,const ImVec2,ImGuiCond) +ImVector_ImVector 2 +1 nil ImVector_ImVector () +2 nil ImVector_ImVectorVector (const ImVector) +igPlotLines 2 +1 void igPlotLines (const char*,const float*,int,int,const char*,float,float,ImVec2,int) +2 void igPlotLinesFnPtr (const char*,float(*)(void*,int),void*,int,int,const char*,float,float,ImVec2) +igTreeNodeExV 2 +1 bool igTreeNodeExVStr (const char*,ImGuiTreeNodeFlags,const char*,va_list) +2 bool igTreeNodeExVPtr (const void*,ImGuiTreeNodeFlags,const char*,va_list) +igListBox 2 +1 bool igListBoxStr_arr (const char*,int*,const char* const[],int,int) +2 bool igListBoxFnPtr (const char*,int*,bool(*)(void*,int,const char**),void*,int,int) +igGetColorU32 3 +1 ImU32 igGetColorU32 (ImGuiCol,float) +2 ImU32 igGetColorU32Vec4 (const ImVec4) +3 ImU32 igGetColorU32U32 (ImU32) igTreePush 2 1 void igTreePushStr (const char*) 2 void igTreePushPtr (const void*) +igListBoxHeader 2 +1 bool igListBoxHeaderVec2 (const char*,const ImVec2) +2 bool igListBoxHeaderInt (const char*,int,int) +igTreeNodeEx 3 +1 bool igTreeNodeExStr (const char*,ImGuiTreeNodeFlags) +2 bool igTreeNodeExStrStr (const char*,ImGuiTreeNodeFlags,const char*,...) +3 bool igTreeNodeExPtr (const void*,ImGuiTreeNodeFlags,const char*,...) +igSelectable 2 +1 bool igSelectable (const char*,bool,ImGuiSelectableFlags,const ImVec2) +2 bool igSelectableBoolPtr (const char*,bool*,ImGuiSelectableFlags,const ImVec2) +ImVector_begin 2 +1 T* ImVector_begin () +2 const T* ImVector_begin_const ()const +igSetWindowCollapsed 2 +1 void igSetWindowCollapsedBool (bool,ImGuiCond) +2 void igSetWindowCollapsedStr (const char*,bool,ImGuiCond) ImColor_ImColor 5 1 nil ImColor_ImColor () 2 nil ImColor_ImColorInt (int,int,int,int) 3 nil ImColor_ImColorU32 (ImU32) 4 nil ImColor_ImColorFloat (float,float,float,float) 5 nil ImColor_ImColorVec4 (const ImVec4) +igPushStyleColor 2 +1 void igPushStyleColorU32 (ImGuiCol,ImU32) +2 void igPushStyleColor (ImGuiCol,const ImVec4) igCollapsingHeader 2 1 bool igCollapsingHeader (const char*,ImGuiTreeNodeFlags) 2 bool igCollapsingHeaderBoolPtr (const char*,bool*,ImGuiTreeNodeFlags) +ImVector_front 2 +1 T* ImVector_front () +2 const T* ImVector_front_const ()const igMenuItem 2 1 bool igMenuItemBool (const char*,const char*,bool,bool) 2 bool igMenuItemBoolPtr (const char*,const char*,bool*,bool) -igTreeNodeEx 3 -1 bool igTreeNodeExStr (const char*,ImGuiTreeNodeFlags) -2 bool igTreeNodeExStrStr (const char*,ImGuiTreeNodeFlags,const char*,...) -3 bool igTreeNodeExPtr (const void*,ImGuiTreeNodeFlags,const char*,...) -igGetColorU32 3 -1 ImU32 igGetColorU32 (ImGuiCol,float) -2 ImU32 igGetColorU32Vec4 (const ImVec4) -3 ImU32 igGetColorU32U32 (ImU32) -igTreeNode 3 -1 bool igTreeNodeStr (const char*) -2 bool igTreeNodeStrStr (const char*,const char*,...) -3 bool igTreeNodePtr (const void*,const char*,...) +ImVec2_ImVec2 2 +1 nil ImVec2_ImVec2 () +2 nil ImVec2_ImVec2Float (float,float) igTreeNodeV 2 1 bool igTreeNodeVStr (const char*,const char*,va_list) 2 bool igTreeNodeVPtr (const void*,const char*,va_list) diff --git a/generator/output/structs_and_enums.json b/generator/output/structs_and_enums.json index 8385e3e..011c60e 100644 --- a/generator/output/structs_and_enums.json +++ b/generator/output/structs_and_enums.json @@ -423,17 +423,17 @@ }, { "calc_value": 1048576, - "name": "ImGuiColorEditFlags_RGB", + "name": "ImGuiColorEditFlags_DisplayRGB", "value": "1 << 20" }, { "calc_value": 2097152, - "name": "ImGuiColorEditFlags_HSV", + "name": "ImGuiColorEditFlags_DisplayHSV", "value": "1 << 21" }, { "calc_value": 4194304, - "name": "ImGuiColorEditFlags_HEX", + "name": "ImGuiColorEditFlags_DisplayHex", "value": "1 << 22" }, { @@ -456,10 +456,25 @@ "name": "ImGuiColorEditFlags_PickerHueWheel", "value": "1 << 26" }, + { + "calc_value": 134217728, + "name": "ImGuiColorEditFlags_InputRGB", + "value": "1 << 27" + }, + { + "calc_value": 268435456, + "name": "ImGuiColorEditFlags_InputHSV", + "value": "1 << 28" + }, + { + "calc_value": 177209344, + "name": "ImGuiColorEditFlags__OptionsDefault", + "value": "ImGuiColorEditFlags_Uint8|ImGuiColorEditFlags_DisplayRGB|ImGuiColorEditFlags_InputRGB|ImGuiColorEditFlags_PickerHueBar" + }, { "calc_value": 7340032, - "name": "ImGuiColorEditFlags__InputsMask", - "value": "ImGuiColorEditFlags_RGB|ImGuiColorEditFlags_HSV|ImGuiColorEditFlags_HEX" + "name": "ImGuiColorEditFlags__DisplayMask", + "value": "ImGuiColorEditFlags_DisplayRGB|ImGuiColorEditFlags_DisplayHSV|ImGuiColorEditFlags_DisplayHex" }, { "calc_value": 25165824, @@ -472,9 +487,9 @@ "value": "ImGuiColorEditFlags_PickerHueWheel|ImGuiColorEditFlags_PickerHueBar" }, { - "calc_value": 42991616, - "name": "ImGuiColorEditFlags__OptionsDefault", - "value": "ImGuiColorEditFlags_Uint8|ImGuiColorEditFlags_RGB|ImGuiColorEditFlags_PickerHueBar" + "calc_value": 402653184, + "name": "ImGuiColorEditFlags__InputMask", + "value": "ImGuiColorEditFlags_InputRGB|ImGuiColorEditFlags_InputHSV" } ], "ImGuiComboFlags_": [ @@ -596,38 +611,58 @@ "ImGuiDataType_": [ { "calc_value": 0, - "name": "ImGuiDataType_S32", + "name": "ImGuiDataType_S8", "value": 0 }, { "calc_value": 1, - "name": "ImGuiDataType_U32", + "name": "ImGuiDataType_U8", "value": 1 }, { "calc_value": 2, - "name": "ImGuiDataType_S64", + "name": "ImGuiDataType_S16", "value": 2 }, { "calc_value": 3, - "name": "ImGuiDataType_U64", + "name": "ImGuiDataType_U16", "value": 3 }, { "calc_value": 4, - "name": "ImGuiDataType_Float", + "name": "ImGuiDataType_S32", "value": 4 }, { "calc_value": 5, - "name": "ImGuiDataType_Double", + "name": "ImGuiDataType_U32", "value": 5 }, { "calc_value": 6, - "name": "ImGuiDataType_COUNT", + "name": "ImGuiDataType_S64", "value": 6 + }, + { + "calc_value": 7, + "name": "ImGuiDataType_U64", + "value": 7 + }, + { + "calc_value": 8, + "name": "ImGuiDataType_Float", + "value": 8 + }, + { + "calc_value": 9, + "name": "ImGuiDataType_Double", + "value": 9 + }, + { + "calc_value": 10, + "name": "ImGuiDataType_COUNT", + "value": 10 } ], "ImGuiDir_": [ @@ -1157,29 +1192,34 @@ }, { "calc_value": 17, - "name": "ImGuiNavInput_KeyLeft_", + "name": "ImGuiNavInput_KeyTab_", "value": 17 }, { "calc_value": 18, - "name": "ImGuiNavInput_KeyRight_", + "name": "ImGuiNavInput_KeyLeft_", "value": 18 }, { "calc_value": 19, - "name": "ImGuiNavInput_KeyUp_", + "name": "ImGuiNavInput_KeyRight_", "value": 19 }, { "calc_value": 20, - "name": "ImGuiNavInput_KeyDown_", + "name": "ImGuiNavInput_KeyUp_", "value": 20 }, { "calc_value": 21, - "name": "ImGuiNavInput_COUNT", + "name": "ImGuiNavInput_KeyDown_", "value": 21 }, + { + "calc_value": 22, + "name": "ImGuiNavInput_COUNT", + "value": 22 + }, { "calc_value": 16, "name": "ImGuiNavInput_InternalStart_", @@ -2277,7 +2317,7 @@ }, { "name": "NavInputs[ImGuiNavInput_COUNT]", - "size": 21, + "size": 22, "type": "float" }, { @@ -2402,12 +2442,12 @@ }, { "name": "NavInputsDownDuration[ImGuiNavInput_COUNT]", - "size": 21, + "size": 22, "type": "float" }, { "name": "NavInputsDownDurationPrev[ImGuiNavInput_COUNT]", - "size": 21, + "size": 22, "type": "float" }, { diff --git a/generator/output/structs_and_enums.lua b/generator/output/structs_and_enums.lua index efde866..141afd0 100644 --- a/generator/output/structs_and_enums.lua +++ b/generator/output/structs_and_enums.lua @@ -336,15 +336,15 @@ defs["enums"]["ImGuiColorEditFlags_"][14]["name"] = "ImGuiColorEditFlags_HDR" defs["enums"]["ImGuiColorEditFlags_"][14]["value"] = "1 << 19" defs["enums"]["ImGuiColorEditFlags_"][15] = {} defs["enums"]["ImGuiColorEditFlags_"][15]["calc_value"] = 1048576 -defs["enums"]["ImGuiColorEditFlags_"][15]["name"] = "ImGuiColorEditFlags_RGB" +defs["enums"]["ImGuiColorEditFlags_"][15]["name"] = "ImGuiColorEditFlags_DisplayRGB" defs["enums"]["ImGuiColorEditFlags_"][15]["value"] = "1 << 20" defs["enums"]["ImGuiColorEditFlags_"][16] = {} defs["enums"]["ImGuiColorEditFlags_"][16]["calc_value"] = 2097152 -defs["enums"]["ImGuiColorEditFlags_"][16]["name"] = "ImGuiColorEditFlags_HSV" +defs["enums"]["ImGuiColorEditFlags_"][16]["name"] = "ImGuiColorEditFlags_DisplayHSV" defs["enums"]["ImGuiColorEditFlags_"][16]["value"] = "1 << 21" defs["enums"]["ImGuiColorEditFlags_"][17] = {} defs["enums"]["ImGuiColorEditFlags_"][17]["calc_value"] = 4194304 -defs["enums"]["ImGuiColorEditFlags_"][17]["name"] = "ImGuiColorEditFlags_HEX" +defs["enums"]["ImGuiColorEditFlags_"][17]["name"] = "ImGuiColorEditFlags_DisplayHex" defs["enums"]["ImGuiColorEditFlags_"][17]["value"] = "1 << 22" defs["enums"]["ImGuiColorEditFlags_"][18] = {} defs["enums"]["ImGuiColorEditFlags_"][18]["calc_value"] = 8388608 @@ -363,21 +363,33 @@ defs["enums"]["ImGuiColorEditFlags_"][21]["calc_value"] = 67108864 defs["enums"]["ImGuiColorEditFlags_"][21]["name"] = "ImGuiColorEditFlags_PickerHueWheel" defs["enums"]["ImGuiColorEditFlags_"][21]["value"] = "1 << 26" defs["enums"]["ImGuiColorEditFlags_"][22] = {} -defs["enums"]["ImGuiColorEditFlags_"][22]["calc_value"] = 7340032 -defs["enums"]["ImGuiColorEditFlags_"][22]["name"] = "ImGuiColorEditFlags__InputsMask" -defs["enums"]["ImGuiColorEditFlags_"][22]["value"] = "ImGuiColorEditFlags_RGB|ImGuiColorEditFlags_HSV|ImGuiColorEditFlags_HEX" +defs["enums"]["ImGuiColorEditFlags_"][22]["calc_value"] = 134217728 +defs["enums"]["ImGuiColorEditFlags_"][22]["name"] = "ImGuiColorEditFlags_InputRGB" +defs["enums"]["ImGuiColorEditFlags_"][22]["value"] = "1 << 27" defs["enums"]["ImGuiColorEditFlags_"][23] = {} -defs["enums"]["ImGuiColorEditFlags_"][23]["calc_value"] = 25165824 -defs["enums"]["ImGuiColorEditFlags_"][23]["name"] = "ImGuiColorEditFlags__DataTypeMask" -defs["enums"]["ImGuiColorEditFlags_"][23]["value"] = "ImGuiColorEditFlags_Uint8|ImGuiColorEditFlags_Float" +defs["enums"]["ImGuiColorEditFlags_"][23]["calc_value"] = 268435456 +defs["enums"]["ImGuiColorEditFlags_"][23]["name"] = "ImGuiColorEditFlags_InputHSV" +defs["enums"]["ImGuiColorEditFlags_"][23]["value"] = "1 << 28" defs["enums"]["ImGuiColorEditFlags_"][24] = {} -defs["enums"]["ImGuiColorEditFlags_"][24]["calc_value"] = 100663296 -defs["enums"]["ImGuiColorEditFlags_"][24]["name"] = "ImGuiColorEditFlags__PickerMask" -defs["enums"]["ImGuiColorEditFlags_"][24]["value"] = "ImGuiColorEditFlags_PickerHueWheel|ImGuiColorEditFlags_PickerHueBar" +defs["enums"]["ImGuiColorEditFlags_"][24]["calc_value"] = 177209344 +defs["enums"]["ImGuiColorEditFlags_"][24]["name"] = "ImGuiColorEditFlags__OptionsDefault" +defs["enums"]["ImGuiColorEditFlags_"][24]["value"] = "ImGuiColorEditFlags_Uint8|ImGuiColorEditFlags_DisplayRGB|ImGuiColorEditFlags_InputRGB|ImGuiColorEditFlags_PickerHueBar" defs["enums"]["ImGuiColorEditFlags_"][25] = {} -defs["enums"]["ImGuiColorEditFlags_"][25]["calc_value"] = 42991616 -defs["enums"]["ImGuiColorEditFlags_"][25]["name"] = "ImGuiColorEditFlags__OptionsDefault" -defs["enums"]["ImGuiColorEditFlags_"][25]["value"] = "ImGuiColorEditFlags_Uint8|ImGuiColorEditFlags_RGB|ImGuiColorEditFlags_PickerHueBar" +defs["enums"]["ImGuiColorEditFlags_"][25]["calc_value"] = 7340032 +defs["enums"]["ImGuiColorEditFlags_"][25]["name"] = "ImGuiColorEditFlags__DisplayMask" +defs["enums"]["ImGuiColorEditFlags_"][25]["value"] = "ImGuiColorEditFlags_DisplayRGB|ImGuiColorEditFlags_DisplayHSV|ImGuiColorEditFlags_DisplayHex" +defs["enums"]["ImGuiColorEditFlags_"][26] = {} +defs["enums"]["ImGuiColorEditFlags_"][26]["calc_value"] = 25165824 +defs["enums"]["ImGuiColorEditFlags_"][26]["name"] = "ImGuiColorEditFlags__DataTypeMask" +defs["enums"]["ImGuiColorEditFlags_"][26]["value"] = "ImGuiColorEditFlags_Uint8|ImGuiColorEditFlags_Float" +defs["enums"]["ImGuiColorEditFlags_"][27] = {} +defs["enums"]["ImGuiColorEditFlags_"][27]["calc_value"] = 100663296 +defs["enums"]["ImGuiColorEditFlags_"][27]["name"] = "ImGuiColorEditFlags__PickerMask" +defs["enums"]["ImGuiColorEditFlags_"][27]["value"] = "ImGuiColorEditFlags_PickerHueWheel|ImGuiColorEditFlags_PickerHueBar" +defs["enums"]["ImGuiColorEditFlags_"][28] = {} +defs["enums"]["ImGuiColorEditFlags_"][28]["calc_value"] = 402653184 +defs["enums"]["ImGuiColorEditFlags_"][28]["name"] = "ImGuiColorEditFlags__InputMask" +defs["enums"]["ImGuiColorEditFlags_"][28]["value"] = "ImGuiColorEditFlags_InputRGB|ImGuiColorEditFlags_InputHSV" defs["enums"]["ImGuiComboFlags_"] = {} defs["enums"]["ImGuiComboFlags_"][1] = {} defs["enums"]["ImGuiComboFlags_"][1]["calc_value"] = 0 @@ -472,32 +484,48 @@ defs["enums"]["ImGuiConfigFlags_"][9]["value"] = "1 << 21" defs["enums"]["ImGuiDataType_"] = {} defs["enums"]["ImGuiDataType_"][1] = {} defs["enums"]["ImGuiDataType_"][1]["calc_value"] = 0 -defs["enums"]["ImGuiDataType_"][1]["name"] = "ImGuiDataType_S32" +defs["enums"]["ImGuiDataType_"][1]["name"] = "ImGuiDataType_S8" defs["enums"]["ImGuiDataType_"][1]["value"] = 0 defs["enums"]["ImGuiDataType_"][2] = {} defs["enums"]["ImGuiDataType_"][2]["calc_value"] = 1 -defs["enums"]["ImGuiDataType_"][2]["name"] = "ImGuiDataType_U32" +defs["enums"]["ImGuiDataType_"][2]["name"] = "ImGuiDataType_U8" defs["enums"]["ImGuiDataType_"][2]["value"] = 1 defs["enums"]["ImGuiDataType_"][3] = {} defs["enums"]["ImGuiDataType_"][3]["calc_value"] = 2 -defs["enums"]["ImGuiDataType_"][3]["name"] = "ImGuiDataType_S64" +defs["enums"]["ImGuiDataType_"][3]["name"] = "ImGuiDataType_S16" defs["enums"]["ImGuiDataType_"][3]["value"] = 2 defs["enums"]["ImGuiDataType_"][4] = {} defs["enums"]["ImGuiDataType_"][4]["calc_value"] = 3 -defs["enums"]["ImGuiDataType_"][4]["name"] = "ImGuiDataType_U64" +defs["enums"]["ImGuiDataType_"][4]["name"] = "ImGuiDataType_U16" defs["enums"]["ImGuiDataType_"][4]["value"] = 3 defs["enums"]["ImGuiDataType_"][5] = {} defs["enums"]["ImGuiDataType_"][5]["calc_value"] = 4 -defs["enums"]["ImGuiDataType_"][5]["name"] = "ImGuiDataType_Float" +defs["enums"]["ImGuiDataType_"][5]["name"] = "ImGuiDataType_S32" defs["enums"]["ImGuiDataType_"][5]["value"] = 4 defs["enums"]["ImGuiDataType_"][6] = {} defs["enums"]["ImGuiDataType_"][6]["calc_value"] = 5 -defs["enums"]["ImGuiDataType_"][6]["name"] = "ImGuiDataType_Double" +defs["enums"]["ImGuiDataType_"][6]["name"] = "ImGuiDataType_U32" defs["enums"]["ImGuiDataType_"][6]["value"] = 5 defs["enums"]["ImGuiDataType_"][7] = {} defs["enums"]["ImGuiDataType_"][7]["calc_value"] = 6 -defs["enums"]["ImGuiDataType_"][7]["name"] = "ImGuiDataType_COUNT" +defs["enums"]["ImGuiDataType_"][7]["name"] = "ImGuiDataType_S64" defs["enums"]["ImGuiDataType_"][7]["value"] = 6 +defs["enums"]["ImGuiDataType_"][8] = {} +defs["enums"]["ImGuiDataType_"][8]["calc_value"] = 7 +defs["enums"]["ImGuiDataType_"][8]["name"] = "ImGuiDataType_U64" +defs["enums"]["ImGuiDataType_"][8]["value"] = 7 +defs["enums"]["ImGuiDataType_"][9] = {} +defs["enums"]["ImGuiDataType_"][9]["calc_value"] = 8 +defs["enums"]["ImGuiDataType_"][9]["name"] = "ImGuiDataType_Float" +defs["enums"]["ImGuiDataType_"][9]["value"] = 8 +defs["enums"]["ImGuiDataType_"][10] = {} +defs["enums"]["ImGuiDataType_"][10]["calc_value"] = 9 +defs["enums"]["ImGuiDataType_"][10]["name"] = "ImGuiDataType_Double" +defs["enums"]["ImGuiDataType_"][10]["value"] = 9 +defs["enums"]["ImGuiDataType_"][11] = {} +defs["enums"]["ImGuiDataType_"][11]["calc_value"] = 10 +defs["enums"]["ImGuiDataType_"][11]["name"] = "ImGuiDataType_COUNT" +defs["enums"]["ImGuiDataType_"][11]["value"] = 10 defs["enums"]["ImGuiDir_"] = {} defs["enums"]["ImGuiDir_"][1] = {} defs["enums"]["ImGuiDir_"][1]["calc_value"] = -1 @@ -916,28 +944,32 @@ defs["enums"]["ImGuiNavInput_"][17]["name"] = "ImGuiNavInput_KeyMenu_" defs["enums"]["ImGuiNavInput_"][17]["value"] = 16 defs["enums"]["ImGuiNavInput_"][18] = {} defs["enums"]["ImGuiNavInput_"][18]["calc_value"] = 17 -defs["enums"]["ImGuiNavInput_"][18]["name"] = "ImGuiNavInput_KeyLeft_" +defs["enums"]["ImGuiNavInput_"][18]["name"] = "ImGuiNavInput_KeyTab_" defs["enums"]["ImGuiNavInput_"][18]["value"] = 17 defs["enums"]["ImGuiNavInput_"][19] = {} defs["enums"]["ImGuiNavInput_"][19]["calc_value"] = 18 -defs["enums"]["ImGuiNavInput_"][19]["name"] = "ImGuiNavInput_KeyRight_" +defs["enums"]["ImGuiNavInput_"][19]["name"] = "ImGuiNavInput_KeyLeft_" defs["enums"]["ImGuiNavInput_"][19]["value"] = 18 defs["enums"]["ImGuiNavInput_"][20] = {} defs["enums"]["ImGuiNavInput_"][20]["calc_value"] = 19 -defs["enums"]["ImGuiNavInput_"][20]["name"] = "ImGuiNavInput_KeyUp_" +defs["enums"]["ImGuiNavInput_"][20]["name"] = "ImGuiNavInput_KeyRight_" defs["enums"]["ImGuiNavInput_"][20]["value"] = 19 defs["enums"]["ImGuiNavInput_"][21] = {} defs["enums"]["ImGuiNavInput_"][21]["calc_value"] = 20 -defs["enums"]["ImGuiNavInput_"][21]["name"] = "ImGuiNavInput_KeyDown_" +defs["enums"]["ImGuiNavInput_"][21]["name"] = "ImGuiNavInput_KeyUp_" defs["enums"]["ImGuiNavInput_"][21]["value"] = 20 defs["enums"]["ImGuiNavInput_"][22] = {} defs["enums"]["ImGuiNavInput_"][22]["calc_value"] = 21 -defs["enums"]["ImGuiNavInput_"][22]["name"] = "ImGuiNavInput_COUNT" +defs["enums"]["ImGuiNavInput_"][22]["name"] = "ImGuiNavInput_KeyDown_" defs["enums"]["ImGuiNavInput_"][22]["value"] = 21 defs["enums"]["ImGuiNavInput_"][23] = {} -defs["enums"]["ImGuiNavInput_"][23]["calc_value"] = 16 -defs["enums"]["ImGuiNavInput_"][23]["name"] = "ImGuiNavInput_InternalStart_" -defs["enums"]["ImGuiNavInput_"][23]["value"] = "ImGuiNavInput_KeyMenu_" +defs["enums"]["ImGuiNavInput_"][23]["calc_value"] = 22 +defs["enums"]["ImGuiNavInput_"][23]["name"] = "ImGuiNavInput_COUNT" +defs["enums"]["ImGuiNavInput_"][23]["value"] = 22 +defs["enums"]["ImGuiNavInput_"][24] = {} +defs["enums"]["ImGuiNavInput_"][24]["calc_value"] = 16 +defs["enums"]["ImGuiNavInput_"][24]["name"] = "ImGuiNavInput_InternalStart_" +defs["enums"]["ImGuiNavInput_"][24]["value"] = "ImGuiNavInput_KeyMenu_" defs["enums"]["ImGuiSelectableFlags_"] = {} defs["enums"]["ImGuiSelectableFlags_"][1] = {} defs["enums"]["ImGuiSelectableFlags_"][1]["calc_value"] = 0 @@ -1775,7 +1807,7 @@ defs["structs"]["ImGuiIO"][44]["size"] = 512 defs["structs"]["ImGuiIO"][44]["type"] = "bool" defs["structs"]["ImGuiIO"][45] = {} defs["structs"]["ImGuiIO"][45]["name"] = "NavInputs[ImGuiNavInput_COUNT]" -defs["structs"]["ImGuiIO"][45]["size"] = 21 +defs["structs"]["ImGuiIO"][45]["size"] = 22 defs["structs"]["ImGuiIO"][45]["type"] = "float" defs["structs"]["ImGuiIO"][46] = {} defs["structs"]["ImGuiIO"][46]["name"] = "WantCaptureMouse" @@ -1872,11 +1904,11 @@ defs["structs"]["ImGuiIO"][72]["size"] = 512 defs["structs"]["ImGuiIO"][72]["type"] = "float" defs["structs"]["ImGuiIO"][73] = {} defs["structs"]["ImGuiIO"][73]["name"] = "NavInputsDownDuration[ImGuiNavInput_COUNT]" -defs["structs"]["ImGuiIO"][73]["size"] = 21 +defs["structs"]["ImGuiIO"][73]["size"] = 22 defs["structs"]["ImGuiIO"][73]["type"] = "float" defs["structs"]["ImGuiIO"][74] = {} defs["structs"]["ImGuiIO"][74]["name"] = "NavInputsDownDurationPrev[ImGuiNavInput_COUNT]" -defs["structs"]["ImGuiIO"][74]["size"] = 21 +defs["structs"]["ImGuiIO"][74]["size"] = 22 defs["structs"]["ImGuiIO"][74]["type"] = "float" defs["structs"]["ImGuiIO"][75] = {} defs["structs"]["ImGuiIO"][75]["name"] = "InputQueueCharacters" diff --git a/generator/output/typedefs_dict.json b/generator/output/typedefs_dict.json index 766c132..11d5ce8 100644 --- a/generator/output/typedefs_dict.json +++ b/generator/output/typedefs_dict.json @@ -53,11 +53,15 @@ "ImGuiTextFilter": "struct ImGuiTextFilter", "ImGuiTreeNodeFlags": "int", "ImGuiWindowFlags": "int", + "ImS16": "signed short", "ImS32": "signed int", "ImS64": "int64_t", + "ImS8": "signed char", "ImTextureID": "void*", + "ImU16": "unsigned short", "ImU32": "unsigned int", "ImU64": "uint64_t", + "ImU8": "unsigned char", "ImVec2": "struct ImVec2", "ImVec4": "struct ImVec4", "ImWchar": "unsigned short", diff --git a/generator/output/typedefs_dict.lua b/generator/output/typedefs_dict.lua index 19a2e8a..e883b1c 100644 --- a/generator/output/typedefs_dict.lua +++ b/generator/output/typedefs_dict.lua @@ -53,11 +53,15 @@ defs["ImGuiTextBuffer"] = "struct ImGuiTextBuffer" defs["ImGuiTextFilter"] = "struct ImGuiTextFilter" defs["ImGuiTreeNodeFlags"] = "int" defs["ImGuiWindowFlags"] = "int" +defs["ImS16"] = "signed short" defs["ImS32"] = "signed int" defs["ImS64"] = "int64_t" +defs["ImS8"] = "signed char" defs["ImTextureID"] = "void*" +defs["ImU16"] = "unsigned short" defs["ImU32"] = "unsigned int" defs["ImU64"] = "uint64_t" +defs["ImU8"] = "unsigned char" defs["ImVec2"] = "struct ImVec2" defs["ImVec4"] = "struct ImVec4" defs["ImWchar"] = "unsigned short" diff --git a/imgui b/imgui index 3c15dff..ebe79bb 160000 --- a/imgui +++ b/imgui @@ -1 +1 @@ -Subproject commit 3c15dffc944419eb4bb17984548468270ca90486 +Subproject commit ebe79bbed00a13fd4455f04131b63d49c28ebd5d