pull imgui master 1.77 and generate

This commit is contained in:
Victor Bombi
2020-06-29 18:55:13 +02:00
parent 13ad240b74
commit bc3bc4583d
12 changed files with 2235 additions and 1353 deletions

View File

@@ -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.76" from Dear ImGui https://github.com/ocornut/imgui
//based on imgui.h file version "1.77" from Dear ImGui https://github.com/ocornut/imgui
//with imgui_internal.h api
#include "./imgui/imgui.h"
@@ -1037,26 +1037,10 @@ CIMGUI_API void igSetTooltipV(const char* fmt,va_list args)
{
return ImGui::SetTooltipV(fmt,args);
}
CIMGUI_API void igOpenPopup(const char* str_id)
{
return ImGui::OpenPopup(str_id);
}
CIMGUI_API bool igBeginPopup(const char* str_id,ImGuiWindowFlags flags)
{
return ImGui::BeginPopup(str_id,flags);
}
CIMGUI_API bool igBeginPopupContextItem(const char* str_id,ImGuiMouseButton mouse_button)
{
return ImGui::BeginPopupContextItem(str_id,mouse_button);
}
CIMGUI_API bool igBeginPopupContextWindow(const char* str_id,ImGuiMouseButton mouse_button,bool also_over_items)
{
return ImGui::BeginPopupContextWindow(str_id,mouse_button,also_over_items);
}
CIMGUI_API bool igBeginPopupContextVoid(const char* str_id,ImGuiMouseButton mouse_button)
{
return ImGui::BeginPopupContextVoid(str_id,mouse_button);
}
CIMGUI_API bool igBeginPopupModal(const char* name,bool* p_open,ImGuiWindowFlags flags)
{
return ImGui::BeginPopupModal(name,p_open,flags);
@@ -1065,18 +1049,34 @@ CIMGUI_API void igEndPopup()
{
return ImGui::EndPopup();
}
CIMGUI_API bool igOpenPopupOnItemClick(const char* str_id,ImGuiMouseButton mouse_button)
CIMGUI_API void igOpenPopup(const char* str_id,ImGuiPopupFlags popup_flags)
{
return ImGui::OpenPopupOnItemClick(str_id,mouse_button);
return ImGui::OpenPopup(str_id,popup_flags);
}
CIMGUI_API bool igIsPopupOpenStr(const char* str_id)
CIMGUI_API bool igOpenPopupContextItem(const char* str_id,ImGuiPopupFlags popup_flags)
{
return ImGui::IsPopupOpen(str_id);
return ImGui::OpenPopupContextItem(str_id,popup_flags);
}
CIMGUI_API void igCloseCurrentPopup()
{
return ImGui::CloseCurrentPopup();
}
CIMGUI_API bool igBeginPopupContextItem(const char* str_id,ImGuiPopupFlags popup_flags)
{
return ImGui::BeginPopupContextItem(str_id,popup_flags);
}
CIMGUI_API bool igBeginPopupContextWindow(const char* str_id,ImGuiPopupFlags popup_flags)
{
return ImGui::BeginPopupContextWindow(str_id,popup_flags);
}
CIMGUI_API bool igBeginPopupContextVoid(const char* str_id,ImGuiPopupFlags popup_flags)
{
return ImGui::BeginPopupContextVoid(str_id,popup_flags);
}
CIMGUI_API bool igIsPopupOpenStr(const char* str_id,ImGuiPopupFlags flags)
{
return ImGui::IsPopupOpen(str_id,flags);
}
CIMGUI_API void igColumns(int count,const char* id,bool border)
{
return ImGui::Columns(count,id,border);
@@ -1977,14 +1977,6 @@ CIMGUI_API void ImDrawList_ChannelsSetCurrent(ImDrawList* self,int n)
{
return self->ChannelsSetCurrent(n);
}
CIMGUI_API void ImDrawList_Clear(ImDrawList* self)
{
return self->Clear();
}
CIMGUI_API void ImDrawList_ClearFreeMemory(ImDrawList* self)
{
return self->ClearFreeMemory();
}
CIMGUI_API void ImDrawList_PrimReserve(ImDrawList* self,int idx_count,int vtx_count)
{
return self->PrimReserve(idx_count,vtx_count);
@@ -2017,13 +2009,29 @@ CIMGUI_API void ImDrawList_PrimVtx(ImDrawList* self,const ImVec2 pos,const ImVec
{
return self->PrimVtx(pos,uv,col);
}
CIMGUI_API void ImDrawList_UpdateClipRect(ImDrawList* self)
CIMGUI_API void ImDrawList__ResetForNewFrame(ImDrawList* self)
{
return self->UpdateClipRect();
return self->_ResetForNewFrame();
}
CIMGUI_API void ImDrawList_UpdateTextureID(ImDrawList* self)
CIMGUI_API void ImDrawList__ClearFreeMemory(ImDrawList* self)
{
return self->UpdateTextureID();
return self->_ClearFreeMemory();
}
CIMGUI_API void ImDrawList__PopUnusedDrawCmd(ImDrawList* self)
{
return self->_PopUnusedDrawCmd();
}
CIMGUI_API void ImDrawList__OnChangedClipRect(ImDrawList* self)
{
return self->_OnChangedClipRect();
}
CIMGUI_API void ImDrawList__OnChangedTextureID(ImDrawList* self)
{
return self->_OnChangedTextureID();
}
CIMGUI_API void ImDrawList__OnChangedVtxOffset(ImDrawList* self)
{
return self->_OnChangedVtxOffset();
}
CIMGUI_API ImDrawData* ImDrawData_ImDrawData(void)
{
@@ -2201,9 +2209,9 @@ CIMGUI_API const ImWchar* ImFontAtlas_GetGlyphRangesVietnamese(ImFontAtlas* self
{
return self->GetGlyphRangesVietnamese();
}
CIMGUI_API int ImFontAtlas_AddCustomRectRegular(ImFontAtlas* self,unsigned int id,int width,int height)
CIMGUI_API int ImFontAtlas_AddCustomRectRegular(ImFontAtlas* self,int width,int height)
{
return self->AddCustomRectRegular(id,width,height);
return self->AddCustomRectRegular(width,height);
}
CIMGUI_API int ImFontAtlas_AddCustomRectFontGlyph(ImFontAtlas* self,ImFont* font,ImWchar id,int width,int height,float advance_x,const ImVec2 offset)
{
@@ -2561,42 +2569,6 @@ CIMGUI_API ImGuiDir igImGetDirQuadrantFromDelta(float dx,float dy)
{
return ImGetDirQuadrantFromDelta(dx,dy);
}
CIMGUI_API bool igImBitArrayTestBit(const ImU32* arr,int n)
{
return ImBitArrayTestBit(arr,n);
}
CIMGUI_API void igImBitArrayClearBit(ImU32* arr,int n)
{
return ImBitArrayClearBit(arr,n);
}
CIMGUI_API void igImBitArraySetBit(ImU32* arr,int n)
{
return ImBitArraySetBit(arr,n);
}
CIMGUI_API void igImBitArraySetBitRange(ImU32* arr,int n,int n2)
{
return ImBitArraySetBitRange(arr,n,n2);
}
CIMGUI_API void ImBitVector_Create(ImBitVector* self,int sz)
{
return self->Create(sz);
}
CIMGUI_API void ImBitVector_Clear(ImBitVector* self)
{
return self->Clear();
}
CIMGUI_API bool ImBitVector_TestBit(ImBitVector* self,int n)
{
return self->TestBit(n);
}
CIMGUI_API void ImBitVector_SetBit(ImBitVector* self,int n)
{
return self->SetBit(n);
}
CIMGUI_API void ImBitVector_ClearBit(ImBitVector* self,int n)
{
return self->ClearBit(n);
}
CIMGUI_API ImVec1* ImVec1_ImVec1Nil(void)
{
return IM_NEW(ImVec1)();
@@ -2733,6 +2705,70 @@ CIMGUI_API bool ImRect_IsInverted(ImRect* self)
{
return self->IsInverted();
}
CIMGUI_API void ImRect_ToVec4(ImVec4 *pOut,ImRect* self)
{
*pOut = self->ToVec4();
}
CIMGUI_API bool igImBitArrayTestBit(const ImU32* arr,int n)
{
return ImBitArrayTestBit(arr,n);
}
CIMGUI_API void igImBitArrayClearBit(ImU32* arr,int n)
{
return ImBitArrayClearBit(arr,n);
}
CIMGUI_API void igImBitArraySetBit(ImU32* arr,int n)
{
return ImBitArraySetBit(arr,n);
}
CIMGUI_API void igImBitArraySetBitRange(ImU32* arr,int n,int n2)
{
return ImBitArraySetBitRange(arr,n,n2);
}
CIMGUI_API void ImBitVector_Create(ImBitVector* self,int sz)
{
return self->Create(sz);
}
CIMGUI_API void ImBitVector_Clear(ImBitVector* self)
{
return self->Clear();
}
CIMGUI_API bool ImBitVector_TestBit(ImBitVector* self,int n)
{
return self->TestBit(n);
}
CIMGUI_API void ImBitVector_SetBit(ImBitVector* self,int n)
{
return self->SetBit(n);
}
CIMGUI_API void ImBitVector_ClearBit(ImBitVector* self,int n)
{
return self->ClearBit(n);
}
CIMGUI_API ImDrawListSharedData* ImDrawListSharedData_ImDrawListSharedData(void)
{
return IM_NEW(ImDrawListSharedData)();
}
CIMGUI_API void ImDrawListSharedData_destroy(ImDrawListSharedData* self)
{
IM_DELETE(self);
}
CIMGUI_API void ImDrawListSharedData_SetCircleSegmentMaxError(ImDrawListSharedData* self,float max_error)
{
return self->SetCircleSegmentMaxError(max_error);
}
CIMGUI_API void ImDrawDataBuilder_Clear(ImDrawDataBuilder* self)
{
return self->Clear();
}
CIMGUI_API void ImDrawDataBuilder_ClearFreeMemory(ImDrawDataBuilder* self)
{
return self->ClearFreeMemory();
}
CIMGUI_API void ImDrawDataBuilder_FlattenIntoSingleLayer(ImDrawDataBuilder* self)
{
return self->FlattenIntoSingleLayer();
}
CIMGUI_API ImGuiStyleMod* ImGuiStyleMod_ImGuiStyleModInt(ImGuiStyleVar idx,int v)
{
return IM_NEW(ImGuiStyleMod)(idx,v);
@@ -2817,26 +2853,6 @@ CIMGUI_API void ImGuiInputTextState_SelectAll(ImGuiInputTextState* self)
{
return self->SelectAll();
}
CIMGUI_API ImGuiWindowSettings* ImGuiWindowSettings_ImGuiWindowSettings(void)
{
return IM_NEW(ImGuiWindowSettings)();
}
CIMGUI_API void ImGuiWindowSettings_destroy(ImGuiWindowSettings* self)
{
IM_DELETE(self);
}
CIMGUI_API char* ImGuiWindowSettings_GetName(ImGuiWindowSettings* self)
{
return self->GetName();
}
CIMGUI_API ImGuiSettingsHandler* ImGuiSettingsHandler_ImGuiSettingsHandler(void)
{
return IM_NEW(ImGuiSettingsHandler)();
}
CIMGUI_API void ImGuiSettingsHandler_destroy(ImGuiSettingsHandler* self)
{
IM_DELETE(self);
}
CIMGUI_API ImGuiPopupData* ImGuiPopupData_ImGuiPopupData(void)
{
return IM_NEW(ImGuiPopupData)();
@@ -2845,50 +2861,6 @@ CIMGUI_API void ImGuiPopupData_destroy(ImGuiPopupData* self)
{
IM_DELETE(self);
}
CIMGUI_API ImGuiColumnData* ImGuiColumnData_ImGuiColumnData(void)
{
return IM_NEW(ImGuiColumnData)();
}
CIMGUI_API void ImGuiColumnData_destroy(ImGuiColumnData* self)
{
IM_DELETE(self);
}
CIMGUI_API ImGuiColumns* ImGuiColumns_ImGuiColumns(void)
{
return IM_NEW(ImGuiColumns)();
}
CIMGUI_API void ImGuiColumns_destroy(ImGuiColumns* self)
{
IM_DELETE(self);
}
CIMGUI_API void ImGuiColumns_Clear(ImGuiColumns* self)
{
return self->Clear();
}
CIMGUI_API ImDrawListSharedData* ImDrawListSharedData_ImDrawListSharedData(void)
{
return IM_NEW(ImDrawListSharedData)();
}
CIMGUI_API void ImDrawListSharedData_destroy(ImDrawListSharedData* self)
{
IM_DELETE(self);
}
CIMGUI_API void ImDrawListSharedData_SetCircleSegmentMaxError(ImDrawListSharedData* self,float max_error)
{
return self->SetCircleSegmentMaxError(max_error);
}
CIMGUI_API void ImDrawDataBuilder_Clear(ImDrawDataBuilder* self)
{
return self->Clear();
}
CIMGUI_API void ImDrawDataBuilder_ClearFreeMemory(ImDrawDataBuilder* self)
{
return self->ClearFreeMemory();
}
CIMGUI_API void ImDrawDataBuilder_FlattenIntoSingleLayer(ImDrawDataBuilder* self)
{
return self->FlattenIntoSingleLayer();
}
CIMGUI_API ImGuiNavMoveResult* ImGuiNavMoveResult_ImGuiNavMoveResult(void)
{
return IM_NEW(ImGuiNavMoveResult)();
@@ -2937,6 +2909,46 @@ CIMGUI_API ImGuiPtrOrIndex* ImGuiPtrOrIndex_ImGuiPtrOrIndexInt(int index)
{
return IM_NEW(ImGuiPtrOrIndex)(index);
}
CIMGUI_API ImGuiColumnData* ImGuiColumnData_ImGuiColumnData(void)
{
return IM_NEW(ImGuiColumnData)();
}
CIMGUI_API void ImGuiColumnData_destroy(ImGuiColumnData* self)
{
IM_DELETE(self);
}
CIMGUI_API ImGuiColumns* ImGuiColumns_ImGuiColumns(void)
{
return IM_NEW(ImGuiColumns)();
}
CIMGUI_API void ImGuiColumns_destroy(ImGuiColumns* self)
{
IM_DELETE(self);
}
CIMGUI_API void ImGuiColumns_Clear(ImGuiColumns* self)
{
return self->Clear();
}
CIMGUI_API ImGuiWindowSettings* ImGuiWindowSettings_ImGuiWindowSettings(void)
{
return IM_NEW(ImGuiWindowSettings)();
}
CIMGUI_API void ImGuiWindowSettings_destroy(ImGuiWindowSettings* self)
{
IM_DELETE(self);
}
CIMGUI_API char* ImGuiWindowSettings_GetName(ImGuiWindowSettings* self)
{
return self->GetName();
}
CIMGUI_API ImGuiSettingsHandler* ImGuiSettingsHandler_ImGuiSettingsHandler(void)
{
return IM_NEW(ImGuiSettingsHandler)();
}
CIMGUI_API void ImGuiSettingsHandler_destroy(ImGuiSettingsHandler* self)
{
IM_DELETE(self);
}
CIMGUI_API ImGuiContext* ImGuiContext_ImGuiContext(ImFontAtlas* shared_font_atlas)
{
return IM_NEW(ImGuiContext)(shared_font_atlas);
@@ -3165,6 +3177,10 @@ CIMGUI_API void igMarkIniSettingsDirtyWindowPtr(ImGuiWindow* window)
{
return ImGui::MarkIniSettingsDirty(window);
}
CIMGUI_API void igClearIniSettings()
{
return ImGui::ClearIniSettings();
}
CIMGUI_API ImGuiWindowSettings* igCreateNewWindowSettings(const char* name)
{
return ImGui::CreateNewWindowSettings(name);
@@ -3181,6 +3197,10 @@ CIMGUI_API ImGuiSettingsHandler* igFindSettingsHandler(const char* type_name)
{
return ImGui::FindSettingsHandler(type_name);
}
CIMGUI_API void igSetNextWindowScroll(const ImVec2 scroll)
{
return ImGui::SetNextWindowScroll(scroll);
}
CIMGUI_API void igSetScrollXWindowPtr(ImGuiWindow* window,float new_scroll_x)
{
return ImGui::SetScrollX(window,new_scroll_x);
@@ -3321,9 +3341,9 @@ CIMGUI_API bool igBeginChildEx(const char* name,ImGuiID id,const ImVec2 size_arg
{
return ImGui::BeginChildEx(name,id,size_arg,border,flags);
}
CIMGUI_API void igOpenPopupEx(ImGuiID id)
CIMGUI_API void igOpenPopupEx(ImGuiID id,ImGuiPopupFlags popup_flags)
{
return ImGui::OpenPopupEx(id);
return ImGui::OpenPopupEx(id,popup_flags);
}
CIMGUI_API void igClosePopupToLevel(int remaining,bool restore_focus_to_window_under_popup)
{
@@ -3333,9 +3353,9 @@ CIMGUI_API void igClosePopupsOverWindow(ImGuiWindow* ref_window,bool restore_foc
{
return ImGui::ClosePopupsOverWindow(ref_window,restore_focus_to_window_under_popup);
}
CIMGUI_API bool igIsPopupOpenID(ImGuiID id)
CIMGUI_API bool igIsPopupOpenID(ImGuiID id,ImGuiPopupFlags popup_flags)
{
return ImGui::IsPopupOpen(id);
return ImGui::IsPopupOpen(id,popup_flags);
}
CIMGUI_API bool igBeginPopupEx(ImGuiID id,ImGuiWindowFlags extra_flags)
{
@@ -3457,6 +3477,10 @@ CIMGUI_API bool igIsDragDropPayloadBeingAccepted()
{
return ImGui::IsDragDropPayloadBeingAccepted();
}
CIMGUI_API void igSetWindowClipRectBeforeSetChannel(ImGuiWindow* window,const ImRect clip_rect)
{
return ImGui::SetWindowClipRectBeforeSetChannel(window,clip_rect);
}
CIMGUI_API void igBeginColumns(const char* str_id,int count,ImGuiColumnsFlags flags)
{
return ImGui::BeginColumns(str_id,count,flags);
@@ -3525,9 +3549,9 @@ CIMGUI_API void igTabItemBackground(ImDrawList* draw_list,const ImRect bb,ImGuiT
{
return ImGui::TabItemBackground(draw_list,bb,flags,col);
}
CIMGUI_API bool igTabItemLabelAndCloseButton(ImDrawList* draw_list,const ImRect bb,ImGuiTabItemFlags flags,ImVec2 frame_padding,const char* label,ImGuiID tab_id,ImGuiID close_button_id)
CIMGUI_API bool igTabItemLabelAndCloseButton(ImDrawList* draw_list,const ImRect bb,ImGuiTabItemFlags flags,ImVec2 frame_padding,const char* label,ImGuiID tab_id,ImGuiID close_button_id,bool is_contents_visible)
{
return ImGui::TabItemLabelAndCloseButton(draw_list,bb,flags,frame_padding,label,tab_id,close_button_id);
return ImGui::TabItemLabelAndCloseButton(draw_list,bb,flags,frame_padding,label,tab_id,close_button_id,is_contents_visible);
}
CIMGUI_API void igRenderText(ImVec2 pos,const char* text,const char* text_end,bool hide_text_after_hash)
{
@@ -3625,6 +3649,10 @@ CIMGUI_API bool igScrollbarEx(const ImRect bb,ImGuiID id,ImGuiAxis axis,float* p
{
return ImGui::ScrollbarEx(bb,id,axis,p_scroll_v,avail_v,contents_v,rounding_corners);
}
CIMGUI_API bool igImageButtonEx(ImGuiID id,ImTextureID texture_id,const ImVec2 size,const ImVec2 uv0,const ImVec2 uv1,const ImVec2 padding,const ImVec4 bg_col,const ImVec4 tint_col)
{
return ImGui::ImageButtonEx(id,texture_id,size,uv0,uv1,padding,bg_col,tint_col);
}
CIMGUI_API void igGetWindowScrollbarRect(ImRect *pOut,ImGuiWindow* window,ImGuiAxis axis)
{
*pOut = ImGui::GetWindowScrollbarRect(window,axis);
@@ -3685,6 +3713,10 @@ CIMGUI_API bool igDataTypeApplyOpFromText(const char* buf,const char* initial_va
{
return ImGui::DataTypeApplyOpFromText(buf,initial_value_buf,data_type,p_data,format);
}
CIMGUI_API bool igDataTypeClamp(ImGuiDataType data_type,void* p_data,const void* p_min,const void* p_max)
{
return ImGui::DataTypeClamp(data_type,p_data,p_min,p_max);
}
CIMGUI_API bool igInputTextEx(const char* label,const char* hint,char* buf,int buf_size,const ImVec2 size_arg,ImGuiInputTextFlags flags,ImGuiInputTextCallback callback,void* user_data)
{
return ImGui::InputTextEx(label,hint,buf,buf_size,size_arg,flags,callback,user_data);
@@ -3693,9 +3725,9 @@ CIMGUI_API bool igTempInputText(const ImRect bb,ImGuiID id,const char* label,cha
{
return ImGui::TempInputText(bb,id,label,buf,buf_size,flags);
}
CIMGUI_API bool igTempInputScalar(const ImRect bb,ImGuiID id,const char* label,ImGuiDataType data_type,void* p_data,const char* format)
CIMGUI_API bool igTempInputScalar(const ImRect bb,ImGuiID id,const char* label,ImGuiDataType data_type,void* p_data,const char* format,const void* p_clamp_min,const void* p_clamp_max)
{
return ImGui::TempInputScalar(bb,id,label,data_type,p_data,format);
return ImGui::TempInputScalar(bb,id,label,data_type,p_data,format,p_clamp_min,p_clamp_max);
}
CIMGUI_API bool igTempInputIsActive(ImGuiID id)
{