diff --git a/cimgui.cpp b/cimgui.cpp index 8b7838b..3507061 100644 --- a/cimgui.cpp +++ b/cimgui.cpp @@ -127,7 +127,7 @@ CIMGUI_API void igEnd() { return ImGui::End(); } -CIMGUI_API bool igBeginChild(const char* str_id,const ImVec2 size,bool border,ImGuiWindowFlags flags) +CIMGUI_API bool igBeginChildStr(const char* str_id,const ImVec2 size,bool border,ImGuiWindowFlags flags) { return ImGui::BeginChild(str_id,size,border,flags); } @@ -311,7 +311,7 @@ CIMGUI_API void igPushStyleColorU32(ImGuiCol idx,ImU32 col) { return ImGui::PushStyleColor(idx,col); } -CIMGUI_API void igPushStyleColor(ImGuiCol idx,const ImVec4 col) +CIMGUI_API void igPushStyleColorVec4(ImGuiCol idx,const ImVec4 col) { return ImGui::PushStyleColor(idx,col); } @@ -347,7 +347,7 @@ CIMGUI_API ImVec2 igGetFontTexUvWhitePixel() { return ImGui::GetFontTexUvWhitePixel(); } -CIMGUI_API ImU32 igGetColorU32(ImGuiCol idx,float alpha_mul) +CIMGUI_API ImU32 igGetColorU32Col(ImGuiCol idx,float alpha_mul) { return ImGui::GetColorU32(idx,alpha_mul); } @@ -495,7 +495,7 @@ CIMGUI_API void igPushIDStr(const char* str_id) { return ImGui::PushID(str_id); } -CIMGUI_API void igPushIDRange(const char* str_id_begin,const char* str_id_end) +CIMGUI_API void igPushIDStrStr(const char* str_id_begin,const char* str_id_end) { return ImGui::PushID(str_id_begin,str_id_end); } @@ -515,7 +515,7 @@ CIMGUI_API ImGuiID igGetIDStr(const char* str_id) { return ImGui::GetID(str_id); } -CIMGUI_API ImGuiID igGetIDRange(const char* str_id_begin,const char* str_id_end) +CIMGUI_API ImGuiID igGetIDStrStr(const char* str_id_begin,const char* str_id_end) { return ImGui::GetID(str_id_begin,str_id_end); } @@ -649,7 +649,7 @@ CIMGUI_API void igEndCombo() { return ImGui::EndCombo(); } -CIMGUI_API bool igCombo(const char* label,int* current_item,const char* const items[],int items_count,int popup_max_height_in_items) +CIMGUI_API bool igComboStr_arr(const char* label,int* current_item,const char* const items[],int items_count,int popup_max_height_in_items) { return ImGui::Combo(label,current_item,items,items_count,popup_max_height_in_items); } @@ -917,7 +917,7 @@ CIMGUI_API float igGetTreeNodeToLabelSpacing() { return ImGui::GetTreeNodeToLabelSpacing(); } -CIMGUI_API bool igCollapsingHeader(const char* label,ImGuiTreeNodeFlags flags) +CIMGUI_API bool igCollapsingHeaderTreeNodeFlags(const char* label,ImGuiTreeNodeFlags flags) { return ImGui::CollapsingHeader(label,flags); } @@ -929,7 +929,7 @@ CIMGUI_API void igSetNextItemOpen(bool is_open,ImGuiCond cond) { return ImGui::SetNextItemOpen(is_open,cond); } -CIMGUI_API bool igSelectable(const char* label,bool selected,ImGuiSelectableFlags flags,const ImVec2 size) +CIMGUI_API bool igSelectableBool(const char* label,bool selected,ImGuiSelectableFlags flags,const ImVec2 size) { return ImGui::Selectable(label,selected,flags,size); } @@ -957,7 +957,7 @@ CIMGUI_API void igListBoxFooter() { return ImGui::ListBoxFooter(); } -CIMGUI_API void igPlotLines(const char* label,const float* values,int values_count,int values_offset,const char* overlay_text,float scale_min,float scale_max,ImVec2 graph_size,int stride) +CIMGUI_API void igPlotLinesFloatPtr(const char* label,const float* values,int values_count,int values_offset,const char* overlay_text,float scale_min,float scale_max,ImVec2 graph_size,int stride) { return ImGui::PlotLines(label,values,values_count,values_offset,overlay_text,scale_min,scale_max,graph_size,stride); } @@ -1872,7 +1872,7 @@ CIMGUI_API void ImDrawList_AddNgonFilled(ImDrawList* self,const ImVec2 center,fl { return self->AddNgonFilled(center,radius,col,num_segments); } -CIMGUI_API void ImDrawList_AddText(ImDrawList* self,const ImVec2 pos,ImU32 col,const char* text_begin,const char* text_end) +CIMGUI_API void ImDrawList_AddTextVec2(ImDrawList* self,const ImVec2 pos,ImU32 col,const char* text_begin,const char* text_end) { return self->AddText(pos,col,text_begin,text_end); } @@ -2280,222 +2280,90 @@ CIMGUI_API void igGetWindowPos_nonUDT(ImVec2 *pOut) { *pOut = ImGui::GetWindowPos(); } -CIMGUI_API ImVec2_Simple igGetWindowPos_nonUDT2() -{ - ImVec2 ret = ImGui::GetWindowPos(); - ImVec2_Simple ret2 = ImVec2ToSimple(ret); - return ret2; -} CIMGUI_API void igGetWindowSize_nonUDT(ImVec2 *pOut) { *pOut = ImGui::GetWindowSize(); } -CIMGUI_API ImVec2_Simple igGetWindowSize_nonUDT2() -{ - ImVec2 ret = ImGui::GetWindowSize(); - ImVec2_Simple ret2 = ImVec2ToSimple(ret); - return ret2; -} CIMGUI_API void igGetContentRegionMax_nonUDT(ImVec2 *pOut) { *pOut = ImGui::GetContentRegionMax(); } -CIMGUI_API ImVec2_Simple igGetContentRegionMax_nonUDT2() -{ - ImVec2 ret = ImGui::GetContentRegionMax(); - ImVec2_Simple ret2 = ImVec2ToSimple(ret); - return ret2; -} CIMGUI_API void igGetContentRegionAvail_nonUDT(ImVec2 *pOut) { *pOut = ImGui::GetContentRegionAvail(); } -CIMGUI_API ImVec2_Simple igGetContentRegionAvail_nonUDT2() -{ - ImVec2 ret = ImGui::GetContentRegionAvail(); - ImVec2_Simple ret2 = ImVec2ToSimple(ret); - return ret2; -} CIMGUI_API void igGetWindowContentRegionMin_nonUDT(ImVec2 *pOut) { *pOut = ImGui::GetWindowContentRegionMin(); } -CIMGUI_API ImVec2_Simple igGetWindowContentRegionMin_nonUDT2() -{ - ImVec2 ret = ImGui::GetWindowContentRegionMin(); - ImVec2_Simple ret2 = ImVec2ToSimple(ret); - return ret2; -} CIMGUI_API void igGetWindowContentRegionMax_nonUDT(ImVec2 *pOut) { *pOut = ImGui::GetWindowContentRegionMax(); } -CIMGUI_API ImVec2_Simple igGetWindowContentRegionMax_nonUDT2() -{ - ImVec2 ret = ImGui::GetWindowContentRegionMax(); - ImVec2_Simple ret2 = ImVec2ToSimple(ret); - return ret2; -} CIMGUI_API void igGetFontTexUvWhitePixel_nonUDT(ImVec2 *pOut) { *pOut = ImGui::GetFontTexUvWhitePixel(); } -CIMGUI_API ImVec2_Simple igGetFontTexUvWhitePixel_nonUDT2() -{ - ImVec2 ret = ImGui::GetFontTexUvWhitePixel(); - ImVec2_Simple ret2 = ImVec2ToSimple(ret); - return ret2; -} CIMGUI_API void igGetCursorPos_nonUDT(ImVec2 *pOut) { *pOut = ImGui::GetCursorPos(); } -CIMGUI_API ImVec2_Simple igGetCursorPos_nonUDT2() -{ - ImVec2 ret = ImGui::GetCursorPos(); - ImVec2_Simple ret2 = ImVec2ToSimple(ret); - return ret2; -} CIMGUI_API void igGetCursorStartPos_nonUDT(ImVec2 *pOut) { *pOut = ImGui::GetCursorStartPos(); } -CIMGUI_API ImVec2_Simple igGetCursorStartPos_nonUDT2() -{ - ImVec2 ret = ImGui::GetCursorStartPos(); - ImVec2_Simple ret2 = ImVec2ToSimple(ret); - return ret2; -} CIMGUI_API void igGetCursorScreenPos_nonUDT(ImVec2 *pOut) { *pOut = ImGui::GetCursorScreenPos(); } -CIMGUI_API ImVec2_Simple igGetCursorScreenPos_nonUDT2() -{ - ImVec2 ret = ImGui::GetCursorScreenPos(); - ImVec2_Simple ret2 = ImVec2ToSimple(ret); - return ret2; -} CIMGUI_API void igGetItemRectMin_nonUDT(ImVec2 *pOut) { *pOut = ImGui::GetItemRectMin(); } -CIMGUI_API ImVec2_Simple igGetItemRectMin_nonUDT2() -{ - ImVec2 ret = ImGui::GetItemRectMin(); - ImVec2_Simple ret2 = ImVec2ToSimple(ret); - return ret2; -} CIMGUI_API void igGetItemRectMax_nonUDT(ImVec2 *pOut) { *pOut = ImGui::GetItemRectMax(); } -CIMGUI_API ImVec2_Simple igGetItemRectMax_nonUDT2() -{ - ImVec2 ret = ImGui::GetItemRectMax(); - ImVec2_Simple ret2 = ImVec2ToSimple(ret); - return ret2; -} CIMGUI_API void igGetItemRectSize_nonUDT(ImVec2 *pOut) { *pOut = ImGui::GetItemRectSize(); } -CIMGUI_API ImVec2_Simple igGetItemRectSize_nonUDT2() -{ - ImVec2 ret = ImGui::GetItemRectSize(); - ImVec2_Simple ret2 = ImVec2ToSimple(ret); - return ret2; -} CIMGUI_API void igCalcTextSize_nonUDT(ImVec2 *pOut,const char* text,const char* text_end,bool hide_text_after_double_hash,float wrap_width) { *pOut = ImGui::CalcTextSize(text,text_end,hide_text_after_double_hash,wrap_width); } -CIMGUI_API ImVec2_Simple igCalcTextSize_nonUDT2(const char* text,const char* text_end,bool hide_text_after_double_hash,float wrap_width) -{ - ImVec2 ret = ImGui::CalcTextSize(text,text_end,hide_text_after_double_hash,wrap_width); - ImVec2_Simple ret2 = ImVec2ToSimple(ret); - return ret2; -} CIMGUI_API void igColorConvertU32ToFloat4_nonUDT(ImVec4 *pOut,ImU32 in) { *pOut = ImGui::ColorConvertU32ToFloat4(in); } -CIMGUI_API ImVec4_Simple igColorConvertU32ToFloat4_nonUDT2(ImU32 in) -{ - ImVec4 ret = ImGui::ColorConvertU32ToFloat4(in); - ImVec4_Simple ret2 = ImVec4ToSimple(ret); - return ret2; -} CIMGUI_API void igGetMousePos_nonUDT(ImVec2 *pOut) { *pOut = ImGui::GetMousePos(); } -CIMGUI_API ImVec2_Simple igGetMousePos_nonUDT2() -{ - ImVec2 ret = ImGui::GetMousePos(); - ImVec2_Simple ret2 = ImVec2ToSimple(ret); - return ret2; -} CIMGUI_API void igGetMousePosOnOpeningCurrentPopup_nonUDT(ImVec2 *pOut) { *pOut = ImGui::GetMousePosOnOpeningCurrentPopup(); } -CIMGUI_API ImVec2_Simple igGetMousePosOnOpeningCurrentPopup_nonUDT2() -{ - ImVec2 ret = ImGui::GetMousePosOnOpeningCurrentPopup(); - ImVec2_Simple ret2 = ImVec2ToSimple(ret); - return ret2; -} CIMGUI_API void igGetMouseDragDelta_nonUDT(ImVec2 *pOut,ImGuiMouseButton button,float lock_threshold) { *pOut = ImGui::GetMouseDragDelta(button,lock_threshold); } -CIMGUI_API ImVec2_Simple igGetMouseDragDelta_nonUDT2(ImGuiMouseButton button,float lock_threshold) -{ - ImVec2 ret = ImGui::GetMouseDragDelta(button,lock_threshold); - ImVec2_Simple ret2 = ImVec2ToSimple(ret); - return ret2; -} CIMGUI_API void ImColor_HSV_nonUDT(ImColor *pOut,ImColor* self,float h,float s,float v,float a) { *pOut = self->HSV(h,s,v,a); } -CIMGUI_API ImColor_Simple ImColor_HSV_nonUDT2(ImColor* self,float h,float s,float v,float a) -{ - ImColor ret = self->HSV(h,s,v,a); - ImColor_Simple ret2 = ImColorToSimple(ret); - return ret2; -} CIMGUI_API void ImDrawList_GetClipRectMin_nonUDT(ImVec2 *pOut,ImDrawList* self) { *pOut = self->GetClipRectMin(); } -CIMGUI_API ImVec2_Simple ImDrawList_GetClipRectMin_nonUDT2(ImDrawList* self) -{ - ImVec2 ret = self->GetClipRectMin(); - ImVec2_Simple ret2 = ImVec2ToSimple(ret); - return ret2; -} CIMGUI_API void ImDrawList_GetClipRectMax_nonUDT(ImVec2 *pOut,ImDrawList* self) { *pOut = self->GetClipRectMax(); } -CIMGUI_API ImVec2_Simple ImDrawList_GetClipRectMax_nonUDT2(ImDrawList* self) -{ - ImVec2 ret = self->GetClipRectMax(); - ImVec2_Simple ret2 = ImVec2ToSimple(ret); - return ret2; -} CIMGUI_API void ImFont_CalcTextSizeA_nonUDT(ImVec2 *pOut,ImFont* self,float size,float max_width,float wrap_width,const char* text_begin,const char* text_end,const char** remaining) { *pOut = self->CalcTextSizeA(size,max_width,wrap_width,text_begin,text_end,remaining); } -CIMGUI_API ImVec2_Simple ImFont_CalcTextSizeA_nonUDT2(ImFont* self,float size,float max_width,float wrap_width,const char* text_begin,const char* text_end,const char** remaining) -{ - ImVec2 ret = self->CalcTextSizeA(size,max_width,wrap_width,text_begin,text_end,remaining); - ImVec2_Simple ret2 = ImVec2ToSimple(ret); - return ret2; -} diff --git a/cimgui.h b/cimgui.h index 871e02c..b2cf7cd 100644 --- a/cimgui.h +++ b/cimgui.h @@ -35,11 +35,6 @@ typedef unsigned __int64 ImU64; //typedef unsigned long long ImU64; #endif -//UDT stuff -typedef struct ImVec2_Simple { float x; float y; } ImVec2_Simple; -typedef struct ImVec4_Simple { float x; float y; float z; float w;} ImVec4_Simple; -typedef struct ImColor_Simple { ImVec4_Simple Value;} ImColor_Simple; - #ifdef CIMGUI_DEFINE_ENUMS_AND_STRUCTS typedef struct ImGuiStoragePair ImGuiStoragePair; @@ -882,28 +877,6 @@ struct ImGuiStoragePair struct GLFWwindow; struct SDL_Window; typedef union SDL_Event SDL_Event; -inline ImVec2_Simple ImVec2ToSimple(ImVec2 vec) -{ - ImVec2_Simple result; - result.x = vec.x; - result.y = vec.y; - return result; -} -inline ImVec4_Simple ImVec4ToSimple(ImVec4 vec) -{ - ImVec4_Simple result; - result.x = vec.x; - result.y = vec.y; - result.z = vec.z; - result.w = vec.w; - return result; -} -inline ImColor_Simple ImColorToSimple(ImColor col) -{ - ImColor_Simple result; - result.Value = ImVec4ToSimple(col.Value); - return result; -} #endif // CIMGUI_DEFINE_ENUMS_AND_STRUCTS #ifndef CIMGUI_DEFINE_ENUMS_AND_STRUCTS @@ -957,7 +930,7 @@ CIMGUI_API void igStyleColorsClassic(ImGuiStyle* dst); CIMGUI_API void igStyleColorsLight(ImGuiStyle* dst); CIMGUI_API bool igBegin(const char* name,bool* p_open,ImGuiWindowFlags flags); CIMGUI_API void igEnd(void); -CIMGUI_API bool igBeginChild(const char* str_id,const ImVec2 size,bool border,ImGuiWindowFlags flags); +CIMGUI_API bool igBeginChildStr(const char* str_id,const ImVec2 size,bool border,ImGuiWindowFlags flags); CIMGUI_API bool igBeginChildID(ImGuiID id,const ImVec2 size,bool border,ImGuiWindowFlags flags); CIMGUI_API void igEndChild(void); CIMGUI_API bool igIsWindowAppearing(void); @@ -1003,7 +976,7 @@ CIMGUI_API void igSetScrollFromPosY(float local_y,float center_y_ratio); CIMGUI_API void igPushFont(ImFont* font); CIMGUI_API void igPopFont(void); CIMGUI_API void igPushStyleColorU32(ImGuiCol idx,ImU32 col); -CIMGUI_API void igPushStyleColor(ImGuiCol idx,const ImVec4 col); +CIMGUI_API void igPushStyleColorVec4(ImGuiCol idx,const ImVec4 col); CIMGUI_API void igPopStyleColor(int count); CIMGUI_API void igPushStyleVarFloat(ImGuiStyleVar idx,float val); CIMGUI_API void igPushStyleVarVec2(ImGuiStyleVar idx,const ImVec2 val); @@ -1012,7 +985,7 @@ CIMGUI_API const ImVec4* igGetStyleColorVec4(ImGuiCol idx); CIMGUI_API ImFont* igGetFont(void); CIMGUI_API float igGetFontSize(void); CIMGUI_API ImVec2 igGetFontTexUvWhitePixel(void); -CIMGUI_API ImU32 igGetColorU32(ImGuiCol idx,float alpha_mul); +CIMGUI_API ImU32 igGetColorU32Col(ImGuiCol idx,float alpha_mul); CIMGUI_API ImU32 igGetColorU32Vec4(const ImVec4 col); CIMGUI_API ImU32 igGetColorU32U32(ImU32 col); CIMGUI_API void igPushItemWidth(float item_width); @@ -1049,12 +1022,12 @@ CIMGUI_API float igGetTextLineHeightWithSpacing(void); CIMGUI_API float igGetFrameHeight(void); CIMGUI_API float igGetFrameHeightWithSpacing(void); CIMGUI_API void igPushIDStr(const char* str_id); -CIMGUI_API void igPushIDRange(const char* str_id_begin,const char* str_id_end); +CIMGUI_API void igPushIDStrStr(const char* str_id_begin,const char* str_id_end); CIMGUI_API void igPushIDPtr(const void* ptr_id); CIMGUI_API void igPushIDInt(int int_id); CIMGUI_API void igPopID(void); CIMGUI_API ImGuiID igGetIDStr(const char* str_id); -CIMGUI_API ImGuiID igGetIDRange(const char* str_id_begin,const char* str_id_end); +CIMGUI_API ImGuiID igGetIDStrStr(const char* str_id_begin,const char* str_id_end); CIMGUI_API ImGuiID igGetIDPtr(const void* ptr_id); CIMGUI_API void igTextUnformatted(const char* text,const char* text_end); CIMGUI_API void igText(const char* fmt,...); @@ -1083,7 +1056,7 @@ CIMGUI_API void igProgressBar(float fraction,const ImVec2 size_arg,const char* o CIMGUI_API void igBullet(void); CIMGUI_API bool igBeginCombo(const char* label,const char* preview_value,ImGuiComboFlags flags); CIMGUI_API void igEndCombo(void); -CIMGUI_API bool igCombo(const char* label,int* current_item,const char* const items[],int items_count,int popup_max_height_in_items); +CIMGUI_API bool igComboStr_arr(const char* label,int* current_item,const char* const items[],int items_count,int popup_max_height_in_items); CIMGUI_API bool igComboStr(const char* label,int* current_item,const char* items_separated_by_zeros,int popup_max_height_in_items); CIMGUI_API bool igComboFnPtr(const char* label,int* current_item,bool(*items_getter)(void* data,int idx,const char** out_text),void* data,int items_count,int popup_max_height_in_items); CIMGUI_API bool igDragFloat(const char* label,float* v,float v_speed,float v_min,float v_max,const char* format,float power); @@ -1146,17 +1119,17 @@ CIMGUI_API void igTreePushStr(const char* str_id); CIMGUI_API void igTreePushPtr(const void* ptr_id); CIMGUI_API void igTreePop(void); CIMGUI_API float igGetTreeNodeToLabelSpacing(void); -CIMGUI_API bool igCollapsingHeader(const char* label,ImGuiTreeNodeFlags flags); +CIMGUI_API bool igCollapsingHeaderTreeNodeFlags(const char* label,ImGuiTreeNodeFlags flags); CIMGUI_API bool igCollapsingHeaderBoolPtr(const char* label,bool* p_open,ImGuiTreeNodeFlags flags); CIMGUI_API void igSetNextItemOpen(bool is_open,ImGuiCond cond); -CIMGUI_API bool igSelectable(const char* label,bool selected,ImGuiSelectableFlags flags,const ImVec2 size); +CIMGUI_API bool igSelectableBool(const char* label,bool selected,ImGuiSelectableFlags flags,const ImVec2 size); CIMGUI_API bool igSelectableBoolPtr(const char* label,bool* p_selected,ImGuiSelectableFlags flags,const ImVec2 size); CIMGUI_API bool igListBoxStr_arr(const char* label,int* current_item,const char* const items[],int items_count,int height_in_items); CIMGUI_API bool igListBoxFnPtr(const char* label,int* current_item,bool(*items_getter)(void* data,int idx,const char** out_text),void* data,int items_count,int height_in_items); CIMGUI_API bool igListBoxHeaderVec2(const char* label,const ImVec2 size); CIMGUI_API bool igListBoxHeaderInt(const char* label,int items_count,int height_in_items); CIMGUI_API void igListBoxFooter(void); -CIMGUI_API void igPlotLines(const char* label,const float* values,int values_count,int values_offset,const char* overlay_text,float scale_min,float scale_max,ImVec2 graph_size,int stride); +CIMGUI_API void igPlotLinesFloatPtr(const char* label,const float* values,int values_count,int values_offset,const char* overlay_text,float scale_min,float scale_max,ImVec2 graph_size,int stride); CIMGUI_API void igPlotLinesFnPtr(const char* label,float(*values_getter)(void* data,int idx),void* data,int values_count,int values_offset,const char* overlay_text,float scale_min,float scale_max,ImVec2 graph_size); CIMGUI_API void igPlotHistogramFloatPtr(const char* label,const float* values,int values_count,int values_offset,const char* overlay_text,float scale_min,float scale_max,ImVec2 graph_size,int stride); CIMGUI_API void igPlotHistogramFnPtr(const char* label,float(*values_getter)(void* data,int idx),void* data,int values_count,int values_offset,const char* overlay_text,float scale_min,float scale_max,ImVec2 graph_size); @@ -1384,7 +1357,7 @@ CIMGUI_API void ImDrawList_AddCircle(ImDrawList* self,const ImVec2 center,float CIMGUI_API void ImDrawList_AddCircleFilled(ImDrawList* self,const ImVec2 center,float radius,ImU32 col,int num_segments); CIMGUI_API void ImDrawList_AddNgon(ImDrawList* self,const ImVec2 center,float radius,ImU32 col,int num_segments,float thickness); CIMGUI_API void ImDrawList_AddNgonFilled(ImDrawList* self,const ImVec2 center,float radius,ImU32 col,int num_segments); -CIMGUI_API void ImDrawList_AddText(ImDrawList* self,const ImVec2 pos,ImU32 col,const char* text_begin,const char* text_end); +CIMGUI_API void ImDrawList_AddTextVec2(ImDrawList* self,const ImVec2 pos,ImU32 col,const char* text_begin,const char* text_end); CIMGUI_API void ImDrawList_AddTextFontPtr(ImDrawList* self,const ImFont* font,float font_size,const ImVec2 pos,ImU32 col,const char* text_begin,const char* text_end,float wrap_width,const ImVec4* cpu_fine_clip_rect); 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); @@ -1486,49 +1459,27 @@ CIMGUI_API void ImFont_AddGlyph(ImFont* self,ImWchar c,float x0,float y0,float x CIMGUI_API void ImFont_AddRemapChar(ImFont* self,ImWchar dst,ImWchar src,bool overwrite_dst); CIMGUI_API void ImFont_SetFallbackChar(ImFont* self,ImWchar c); CIMGUI_API void igGetWindowPos_nonUDT(ImVec2 *pOut); -CIMGUI_API ImVec2_Simple igGetWindowPos_nonUDT2(void); CIMGUI_API void igGetWindowSize_nonUDT(ImVec2 *pOut); -CIMGUI_API ImVec2_Simple igGetWindowSize_nonUDT2(void); CIMGUI_API void igGetContentRegionMax_nonUDT(ImVec2 *pOut); -CIMGUI_API ImVec2_Simple igGetContentRegionMax_nonUDT2(void); CIMGUI_API void igGetContentRegionAvail_nonUDT(ImVec2 *pOut); -CIMGUI_API ImVec2_Simple igGetContentRegionAvail_nonUDT2(void); CIMGUI_API void igGetWindowContentRegionMin_nonUDT(ImVec2 *pOut); -CIMGUI_API ImVec2_Simple igGetWindowContentRegionMin_nonUDT2(void); CIMGUI_API void igGetWindowContentRegionMax_nonUDT(ImVec2 *pOut); -CIMGUI_API ImVec2_Simple igGetWindowContentRegionMax_nonUDT2(void); CIMGUI_API void igGetFontTexUvWhitePixel_nonUDT(ImVec2 *pOut); -CIMGUI_API ImVec2_Simple igGetFontTexUvWhitePixel_nonUDT2(void); CIMGUI_API void igGetCursorPos_nonUDT(ImVec2 *pOut); -CIMGUI_API ImVec2_Simple igGetCursorPos_nonUDT2(void); CIMGUI_API void igGetCursorStartPos_nonUDT(ImVec2 *pOut); -CIMGUI_API ImVec2_Simple igGetCursorStartPos_nonUDT2(void); CIMGUI_API void igGetCursorScreenPos_nonUDT(ImVec2 *pOut); -CIMGUI_API ImVec2_Simple igGetCursorScreenPos_nonUDT2(void); CIMGUI_API void igGetItemRectMin_nonUDT(ImVec2 *pOut); -CIMGUI_API ImVec2_Simple igGetItemRectMin_nonUDT2(void); CIMGUI_API void igGetItemRectMax_nonUDT(ImVec2 *pOut); -CIMGUI_API ImVec2_Simple igGetItemRectMax_nonUDT2(void); CIMGUI_API void igGetItemRectSize_nonUDT(ImVec2 *pOut); -CIMGUI_API ImVec2_Simple igGetItemRectSize_nonUDT2(void); CIMGUI_API void igCalcTextSize_nonUDT(ImVec2 *pOut,const char* text,const char* text_end,bool hide_text_after_double_hash,float wrap_width); -CIMGUI_API ImVec2_Simple igCalcTextSize_nonUDT2(const char* text,const char* text_end,bool hide_text_after_double_hash,float wrap_width); CIMGUI_API void igColorConvertU32ToFloat4_nonUDT(ImVec4 *pOut,ImU32 in); -CIMGUI_API ImVec4_Simple igColorConvertU32ToFloat4_nonUDT2(ImU32 in); CIMGUI_API void igGetMousePos_nonUDT(ImVec2 *pOut); -CIMGUI_API ImVec2_Simple igGetMousePos_nonUDT2(void); CIMGUI_API void igGetMousePosOnOpeningCurrentPopup_nonUDT(ImVec2 *pOut); -CIMGUI_API ImVec2_Simple igGetMousePosOnOpeningCurrentPopup_nonUDT2(void); CIMGUI_API void igGetMouseDragDelta_nonUDT(ImVec2 *pOut,ImGuiMouseButton button,float lock_threshold); -CIMGUI_API ImVec2_Simple igGetMouseDragDelta_nonUDT2(ImGuiMouseButton button,float lock_threshold); CIMGUI_API void ImColor_HSV_nonUDT(ImColor *pOut,ImColor* self,float h,float s,float v,float a); -CIMGUI_API ImColor_Simple ImColor_HSV_nonUDT2(ImColor* self,float h,float s,float v,float a); CIMGUI_API void ImDrawList_GetClipRectMin_nonUDT(ImVec2 *pOut,ImDrawList* self); -CIMGUI_API ImVec2_Simple ImDrawList_GetClipRectMin_nonUDT2(ImDrawList* self); CIMGUI_API void ImDrawList_GetClipRectMax_nonUDT(ImVec2 *pOut,ImDrawList* self); -CIMGUI_API ImVec2_Simple ImDrawList_GetClipRectMax_nonUDT2(ImDrawList* self); CIMGUI_API void ImFont_CalcTextSizeA_nonUDT(ImVec2 *pOut,ImFont* self,float size,float max_width,float wrap_width,const char* text_begin,const char* text_end,const char** remaining); -CIMGUI_API ImVec2_Simple ImFont_CalcTextSizeA_nonUDT2(ImFont* self,float size,float max_width,float wrap_width,const char* text_begin,const char* text_end,const char** remaining); /////////////////////////hand written functions diff --git a/generator/cimgui_template.h b/generator/cimgui_template.h index 8b47f61..e79c507 100644 --- a/generator/cimgui_template.h +++ b/generator/cimgui_template.h @@ -33,11 +33,6 @@ typedef unsigned __int64 ImU64; //typedef unsigned long long ImU64; #endif -//UDT stuff -typedef struct ImVec2_Simple { float x; float y; } ImVec2_Simple; -typedef struct ImVec4_Simple { float x; float y; float z; float w;} ImVec4_Simple; -typedef struct ImColor_Simple { ImVec4_Simple Value;} ImColor_Simple; - #ifdef CIMGUI_DEFINE_ENUMS_AND_STRUCTS #include "imgui_structs.h" @@ -45,28 +40,6 @@ typedef struct ImColor_Simple { ImVec4_Simple Value;} ImColor_Simple; struct GLFWwindow; struct SDL_Window; typedef union SDL_Event SDL_Event; -inline ImVec2_Simple ImVec2ToSimple(ImVec2 vec) -{ - ImVec2_Simple result; - result.x = vec.x; - result.y = vec.y; - return result; -} -inline ImVec4_Simple ImVec4ToSimple(ImVec4 vec) -{ - ImVec4_Simple result; - result.x = vec.x; - result.y = vec.y; - result.z = vec.z; - result.w = vec.w; - return result; -} -inline ImColor_Simple ImColorToSimple(ImColor col) -{ - ImColor_Simple result; - result.Value = ImVec4ToSimple(col.Value); - return result; -} #endif // CIMGUI_DEFINE_ENUMS_AND_STRUCTS #include "auto_funcs.h" diff --git a/generator/cpp2ffi.lua b/generator/cpp2ffi.lua index d5f606f..94b12e2 100644 --- a/generator/cpp2ffi.lua +++ b/generator/cpp2ffi.lua @@ -601,9 +601,6 @@ end local function ADDnonUDT(FP) local defsT = FP.defsT local newcdefs = {} - --for cimguiname,defs in pairs(defsT) do - --for i,defT in ipairs(defs) do - --local t = {cimguiname=cimguiname,signature=defT.signature,ret=defT.ret} for numcdef,t in ipairs(FP.funcdefs) do if t.cimguiname then local cimf = defsT[t.cimguiname] @@ -635,30 +632,9 @@ local function ADDnonUDT(FP) defsT[t.cimguiname][#defsT[t.cimguiname] + 1] = defT2 defsT[t.cimguiname][t.signature.."nonUDT"] = defT2 table.insert(newcdefs,{stname=t.stname,funcname=t.funcname,args=args,argsc=argscsinpars,signature=t.signature.."nonUDT",cimguiname=t.cimguiname,call_args=call_args,ret =t.ret}) - --converting to Simple type---------------------------------------------------- - local defT3 = {} - --first strings - for k,v in pairs(defT) do - defT3[k] = v - end - --then argsT table - defT3.argsT = {} - for k,v in ipairs(defT.argsT) do - table.insert(defT3.argsT,{type=v.type,name=v.name}) - end - local comma = (#defT.argsT > 0) and "," or "" - --defT3.args = "("..defT.ret.." *pOut"..comma..defT.args:sub(2) - defT3.ret = defT.ret.."_Simple" - defT3.retorig = defT.ret - defT3.ov_cimguiname = (defT3.ov_cimguiname or defT3.cimguiname).."_nonUDT2" - defT3.nonUDT = 2 - defT3.retref = nil - defsT[t.cimguiname][#defsT[t.cimguiname] + 1] = defT3 - defsT[t.cimguiname][t.signature.."nonUDT2"] = defT3 - table.insert(newcdefs,{stname=t.stname,funcname=t.funcname,args=args,argsc=argscsinpars,signature=t.signature.."nonUDT2",cimguiname=t.cimguiname,call_args=call_args,ret =t.ret}) end + else print("not cimguiname in");M.prtable(t) end - --end end for i,v in ipairs(newcdefs) do table.insert(FP.funcdefs,v) diff --git a/generator/generator.lua b/generator/generator.lua index d8b1c7c..3ebfe29 100644 --- a/generator/generator.lua +++ b/generator/generator.lua @@ -58,54 +58,12 @@ local cimgui_manuals = { --desired name --------------------------------------------------------------------------- local cimgui_overloads = { - igPushID = { + --igPushID = { --["(const char*)"] = "igPushIDStr", - ["(const char*,const char*)"] = "igPushIDRange", + --["(const char*,const char*)"] = "igPushIDRange", --["(const void*)"] = "igPushIDPtr", --["(int)"] = "igPushIDInt" - }, - igGetID = { - ["(const char*,const char*)"] = "igGetIDRange", - }, - ImDrawList_AddText = { - ["(const ImVec2,ImU32,const char*,const char*)"] = "ImDrawList_AddText", - }, - igGetColorU32 = { - ["(ImGuiCol,float)"] = "igGetColorU32", - }, - igCollapsingHeader = { - ["(const char*,ImGuiTreeNodeFlags)"] = "igCollapsingHeader", - }, - igCombo = { - ["(const char*,int*,const char* const[],int,int)"] = "igCombo", - }, - igPlotLines = { - ["(const char*,const float*,int,int,const char*,float,float,ImVec2,int)"] = "igPlotLines", - }, - igBeginChild = { - ["(const char*,const ImVec2,bool,ImGuiWindowFlags)"] = "igBeginChild", - }, - igSelectable = { - ["(const char*,bool,ImGuiSelectableFlags,const ImVec2)"] = "igSelectable" - }, - igPushStyleColor = { - ["(ImGuiCol,const ImVec4)"] = "igPushStyleColor" - }, - igSetScrollFromPosX = { - ["(float,float)"] = "igSetScrollFromPosX" - }, - igSetScrollFromPosY = { - ["(float,float)"] = "igSetScrollFromPosY" - }, - igSetScrollX = { - ["(float)"] = "igSetScrollX" - }, - igSetScrollY = { - ["(float)"] = "igSetScrollY" - }, - igIsPopupOpen ={ - ["(const char*)"] = "igIsPopupOpen" - }, + --}, } --------------------------header definitions @@ -319,10 +277,6 @@ local function ImGui_f_implementation(outtab,def) elseif def.nonUDT then if def.nonUDT == 1 then table.insert(outtab," *pOut = "..namespace..def.funcname..def.call_args..";\n") - else --nonUDT==2 - table.insert(outtab," "..def.retorig.." ret = "..namespace..def.funcname..def.call_args..";\n") - table.insert(outtab," "..def.ret.." ret2 = "..def.retorig.."ToSimple(ret);\n") - table.insert(outtab," return ret2;\n") end else --standard ImGui table.insert(outtab," return "..ptret..namespace..def.funcname..def.call_args..";\n") @@ -353,10 +307,6 @@ local function struct_f_implementation(outtab,def) elseif def.nonUDT then if def.nonUDT == 1 then table.insert(outtab," *pOut = self->"..def.funcname..def.call_args..";\n") - else --nonUDT==2 - table.insert(outtab," "..def.retorig.." ret = self->"..def.funcname..def.call_args..";\n") - table.insert(outtab," "..def.ret.." ret2 = "..def.retorig.."ToSimple(ret);\n") - table.insert(outtab," return ret2;\n") end else --standard struct table.insert(outtab," return "..ptret.."self->"..def.funcname..def.call_args..";\n") diff --git a/generator/output/cimgui.cpp b/generator/output/cimgui.cpp index 8b7838b..3507061 100644 --- a/generator/output/cimgui.cpp +++ b/generator/output/cimgui.cpp @@ -127,7 +127,7 @@ CIMGUI_API void igEnd() { return ImGui::End(); } -CIMGUI_API bool igBeginChild(const char* str_id,const ImVec2 size,bool border,ImGuiWindowFlags flags) +CIMGUI_API bool igBeginChildStr(const char* str_id,const ImVec2 size,bool border,ImGuiWindowFlags flags) { return ImGui::BeginChild(str_id,size,border,flags); } @@ -311,7 +311,7 @@ CIMGUI_API void igPushStyleColorU32(ImGuiCol idx,ImU32 col) { return ImGui::PushStyleColor(idx,col); } -CIMGUI_API void igPushStyleColor(ImGuiCol idx,const ImVec4 col) +CIMGUI_API void igPushStyleColorVec4(ImGuiCol idx,const ImVec4 col) { return ImGui::PushStyleColor(idx,col); } @@ -347,7 +347,7 @@ CIMGUI_API ImVec2 igGetFontTexUvWhitePixel() { return ImGui::GetFontTexUvWhitePixel(); } -CIMGUI_API ImU32 igGetColorU32(ImGuiCol idx,float alpha_mul) +CIMGUI_API ImU32 igGetColorU32Col(ImGuiCol idx,float alpha_mul) { return ImGui::GetColorU32(idx,alpha_mul); } @@ -495,7 +495,7 @@ CIMGUI_API void igPushIDStr(const char* str_id) { return ImGui::PushID(str_id); } -CIMGUI_API void igPushIDRange(const char* str_id_begin,const char* str_id_end) +CIMGUI_API void igPushIDStrStr(const char* str_id_begin,const char* str_id_end) { return ImGui::PushID(str_id_begin,str_id_end); } @@ -515,7 +515,7 @@ CIMGUI_API ImGuiID igGetIDStr(const char* str_id) { return ImGui::GetID(str_id); } -CIMGUI_API ImGuiID igGetIDRange(const char* str_id_begin,const char* str_id_end) +CIMGUI_API ImGuiID igGetIDStrStr(const char* str_id_begin,const char* str_id_end) { return ImGui::GetID(str_id_begin,str_id_end); } @@ -649,7 +649,7 @@ CIMGUI_API void igEndCombo() { return ImGui::EndCombo(); } -CIMGUI_API bool igCombo(const char* label,int* current_item,const char* const items[],int items_count,int popup_max_height_in_items) +CIMGUI_API bool igComboStr_arr(const char* label,int* current_item,const char* const items[],int items_count,int popup_max_height_in_items) { return ImGui::Combo(label,current_item,items,items_count,popup_max_height_in_items); } @@ -917,7 +917,7 @@ CIMGUI_API float igGetTreeNodeToLabelSpacing() { return ImGui::GetTreeNodeToLabelSpacing(); } -CIMGUI_API bool igCollapsingHeader(const char* label,ImGuiTreeNodeFlags flags) +CIMGUI_API bool igCollapsingHeaderTreeNodeFlags(const char* label,ImGuiTreeNodeFlags flags) { return ImGui::CollapsingHeader(label,flags); } @@ -929,7 +929,7 @@ CIMGUI_API void igSetNextItemOpen(bool is_open,ImGuiCond cond) { return ImGui::SetNextItemOpen(is_open,cond); } -CIMGUI_API bool igSelectable(const char* label,bool selected,ImGuiSelectableFlags flags,const ImVec2 size) +CIMGUI_API bool igSelectableBool(const char* label,bool selected,ImGuiSelectableFlags flags,const ImVec2 size) { return ImGui::Selectable(label,selected,flags,size); } @@ -957,7 +957,7 @@ CIMGUI_API void igListBoxFooter() { return ImGui::ListBoxFooter(); } -CIMGUI_API void igPlotLines(const char* label,const float* values,int values_count,int values_offset,const char* overlay_text,float scale_min,float scale_max,ImVec2 graph_size,int stride) +CIMGUI_API void igPlotLinesFloatPtr(const char* label,const float* values,int values_count,int values_offset,const char* overlay_text,float scale_min,float scale_max,ImVec2 graph_size,int stride) { return ImGui::PlotLines(label,values,values_count,values_offset,overlay_text,scale_min,scale_max,graph_size,stride); } @@ -1872,7 +1872,7 @@ CIMGUI_API void ImDrawList_AddNgonFilled(ImDrawList* self,const ImVec2 center,fl { return self->AddNgonFilled(center,radius,col,num_segments); } -CIMGUI_API void ImDrawList_AddText(ImDrawList* self,const ImVec2 pos,ImU32 col,const char* text_begin,const char* text_end) +CIMGUI_API void ImDrawList_AddTextVec2(ImDrawList* self,const ImVec2 pos,ImU32 col,const char* text_begin,const char* text_end) { return self->AddText(pos,col,text_begin,text_end); } @@ -2280,222 +2280,90 @@ CIMGUI_API void igGetWindowPos_nonUDT(ImVec2 *pOut) { *pOut = ImGui::GetWindowPos(); } -CIMGUI_API ImVec2_Simple igGetWindowPos_nonUDT2() -{ - ImVec2 ret = ImGui::GetWindowPos(); - ImVec2_Simple ret2 = ImVec2ToSimple(ret); - return ret2; -} CIMGUI_API void igGetWindowSize_nonUDT(ImVec2 *pOut) { *pOut = ImGui::GetWindowSize(); } -CIMGUI_API ImVec2_Simple igGetWindowSize_nonUDT2() -{ - ImVec2 ret = ImGui::GetWindowSize(); - ImVec2_Simple ret2 = ImVec2ToSimple(ret); - return ret2; -} CIMGUI_API void igGetContentRegionMax_nonUDT(ImVec2 *pOut) { *pOut = ImGui::GetContentRegionMax(); } -CIMGUI_API ImVec2_Simple igGetContentRegionMax_nonUDT2() -{ - ImVec2 ret = ImGui::GetContentRegionMax(); - ImVec2_Simple ret2 = ImVec2ToSimple(ret); - return ret2; -} CIMGUI_API void igGetContentRegionAvail_nonUDT(ImVec2 *pOut) { *pOut = ImGui::GetContentRegionAvail(); } -CIMGUI_API ImVec2_Simple igGetContentRegionAvail_nonUDT2() -{ - ImVec2 ret = ImGui::GetContentRegionAvail(); - ImVec2_Simple ret2 = ImVec2ToSimple(ret); - return ret2; -} CIMGUI_API void igGetWindowContentRegionMin_nonUDT(ImVec2 *pOut) { *pOut = ImGui::GetWindowContentRegionMin(); } -CIMGUI_API ImVec2_Simple igGetWindowContentRegionMin_nonUDT2() -{ - ImVec2 ret = ImGui::GetWindowContentRegionMin(); - ImVec2_Simple ret2 = ImVec2ToSimple(ret); - return ret2; -} CIMGUI_API void igGetWindowContentRegionMax_nonUDT(ImVec2 *pOut) { *pOut = ImGui::GetWindowContentRegionMax(); } -CIMGUI_API ImVec2_Simple igGetWindowContentRegionMax_nonUDT2() -{ - ImVec2 ret = ImGui::GetWindowContentRegionMax(); - ImVec2_Simple ret2 = ImVec2ToSimple(ret); - return ret2; -} CIMGUI_API void igGetFontTexUvWhitePixel_nonUDT(ImVec2 *pOut) { *pOut = ImGui::GetFontTexUvWhitePixel(); } -CIMGUI_API ImVec2_Simple igGetFontTexUvWhitePixel_nonUDT2() -{ - ImVec2 ret = ImGui::GetFontTexUvWhitePixel(); - ImVec2_Simple ret2 = ImVec2ToSimple(ret); - return ret2; -} CIMGUI_API void igGetCursorPos_nonUDT(ImVec2 *pOut) { *pOut = ImGui::GetCursorPos(); } -CIMGUI_API ImVec2_Simple igGetCursorPos_nonUDT2() -{ - ImVec2 ret = ImGui::GetCursorPos(); - ImVec2_Simple ret2 = ImVec2ToSimple(ret); - return ret2; -} CIMGUI_API void igGetCursorStartPos_nonUDT(ImVec2 *pOut) { *pOut = ImGui::GetCursorStartPos(); } -CIMGUI_API ImVec2_Simple igGetCursorStartPos_nonUDT2() -{ - ImVec2 ret = ImGui::GetCursorStartPos(); - ImVec2_Simple ret2 = ImVec2ToSimple(ret); - return ret2; -} CIMGUI_API void igGetCursorScreenPos_nonUDT(ImVec2 *pOut) { *pOut = ImGui::GetCursorScreenPos(); } -CIMGUI_API ImVec2_Simple igGetCursorScreenPos_nonUDT2() -{ - ImVec2 ret = ImGui::GetCursorScreenPos(); - ImVec2_Simple ret2 = ImVec2ToSimple(ret); - return ret2; -} CIMGUI_API void igGetItemRectMin_nonUDT(ImVec2 *pOut) { *pOut = ImGui::GetItemRectMin(); } -CIMGUI_API ImVec2_Simple igGetItemRectMin_nonUDT2() -{ - ImVec2 ret = ImGui::GetItemRectMin(); - ImVec2_Simple ret2 = ImVec2ToSimple(ret); - return ret2; -} CIMGUI_API void igGetItemRectMax_nonUDT(ImVec2 *pOut) { *pOut = ImGui::GetItemRectMax(); } -CIMGUI_API ImVec2_Simple igGetItemRectMax_nonUDT2() -{ - ImVec2 ret = ImGui::GetItemRectMax(); - ImVec2_Simple ret2 = ImVec2ToSimple(ret); - return ret2; -} CIMGUI_API void igGetItemRectSize_nonUDT(ImVec2 *pOut) { *pOut = ImGui::GetItemRectSize(); } -CIMGUI_API ImVec2_Simple igGetItemRectSize_nonUDT2() -{ - ImVec2 ret = ImGui::GetItemRectSize(); - ImVec2_Simple ret2 = ImVec2ToSimple(ret); - return ret2; -} CIMGUI_API void igCalcTextSize_nonUDT(ImVec2 *pOut,const char* text,const char* text_end,bool hide_text_after_double_hash,float wrap_width) { *pOut = ImGui::CalcTextSize(text,text_end,hide_text_after_double_hash,wrap_width); } -CIMGUI_API ImVec2_Simple igCalcTextSize_nonUDT2(const char* text,const char* text_end,bool hide_text_after_double_hash,float wrap_width) -{ - ImVec2 ret = ImGui::CalcTextSize(text,text_end,hide_text_after_double_hash,wrap_width); - ImVec2_Simple ret2 = ImVec2ToSimple(ret); - return ret2; -} CIMGUI_API void igColorConvertU32ToFloat4_nonUDT(ImVec4 *pOut,ImU32 in) { *pOut = ImGui::ColorConvertU32ToFloat4(in); } -CIMGUI_API ImVec4_Simple igColorConvertU32ToFloat4_nonUDT2(ImU32 in) -{ - ImVec4 ret = ImGui::ColorConvertU32ToFloat4(in); - ImVec4_Simple ret2 = ImVec4ToSimple(ret); - return ret2; -} CIMGUI_API void igGetMousePos_nonUDT(ImVec2 *pOut) { *pOut = ImGui::GetMousePos(); } -CIMGUI_API ImVec2_Simple igGetMousePos_nonUDT2() -{ - ImVec2 ret = ImGui::GetMousePos(); - ImVec2_Simple ret2 = ImVec2ToSimple(ret); - return ret2; -} CIMGUI_API void igGetMousePosOnOpeningCurrentPopup_nonUDT(ImVec2 *pOut) { *pOut = ImGui::GetMousePosOnOpeningCurrentPopup(); } -CIMGUI_API ImVec2_Simple igGetMousePosOnOpeningCurrentPopup_nonUDT2() -{ - ImVec2 ret = ImGui::GetMousePosOnOpeningCurrentPopup(); - ImVec2_Simple ret2 = ImVec2ToSimple(ret); - return ret2; -} CIMGUI_API void igGetMouseDragDelta_nonUDT(ImVec2 *pOut,ImGuiMouseButton button,float lock_threshold) { *pOut = ImGui::GetMouseDragDelta(button,lock_threshold); } -CIMGUI_API ImVec2_Simple igGetMouseDragDelta_nonUDT2(ImGuiMouseButton button,float lock_threshold) -{ - ImVec2 ret = ImGui::GetMouseDragDelta(button,lock_threshold); - ImVec2_Simple ret2 = ImVec2ToSimple(ret); - return ret2; -} CIMGUI_API void ImColor_HSV_nonUDT(ImColor *pOut,ImColor* self,float h,float s,float v,float a) { *pOut = self->HSV(h,s,v,a); } -CIMGUI_API ImColor_Simple ImColor_HSV_nonUDT2(ImColor* self,float h,float s,float v,float a) -{ - ImColor ret = self->HSV(h,s,v,a); - ImColor_Simple ret2 = ImColorToSimple(ret); - return ret2; -} CIMGUI_API void ImDrawList_GetClipRectMin_nonUDT(ImVec2 *pOut,ImDrawList* self) { *pOut = self->GetClipRectMin(); } -CIMGUI_API ImVec2_Simple ImDrawList_GetClipRectMin_nonUDT2(ImDrawList* self) -{ - ImVec2 ret = self->GetClipRectMin(); - ImVec2_Simple ret2 = ImVec2ToSimple(ret); - return ret2; -} CIMGUI_API void ImDrawList_GetClipRectMax_nonUDT(ImVec2 *pOut,ImDrawList* self) { *pOut = self->GetClipRectMax(); } -CIMGUI_API ImVec2_Simple ImDrawList_GetClipRectMax_nonUDT2(ImDrawList* self) -{ - ImVec2 ret = self->GetClipRectMax(); - ImVec2_Simple ret2 = ImVec2ToSimple(ret); - return ret2; -} CIMGUI_API void ImFont_CalcTextSizeA_nonUDT(ImVec2 *pOut,ImFont* self,float size,float max_width,float wrap_width,const char* text_begin,const char* text_end,const char** remaining) { *pOut = self->CalcTextSizeA(size,max_width,wrap_width,text_begin,text_end,remaining); } -CIMGUI_API ImVec2_Simple ImFont_CalcTextSizeA_nonUDT2(ImFont* self,float size,float max_width,float wrap_width,const char* text_begin,const char* text_end,const char** remaining) -{ - ImVec2 ret = self->CalcTextSizeA(size,max_width,wrap_width,text_begin,text_end,remaining); - ImVec2_Simple ret2 = ImVec2ToSimple(ret); - return ret2; -} diff --git a/generator/output/cimgui.h b/generator/output/cimgui.h index 871e02c..b2cf7cd 100644 --- a/generator/output/cimgui.h +++ b/generator/output/cimgui.h @@ -35,11 +35,6 @@ typedef unsigned __int64 ImU64; //typedef unsigned long long ImU64; #endif -//UDT stuff -typedef struct ImVec2_Simple { float x; float y; } ImVec2_Simple; -typedef struct ImVec4_Simple { float x; float y; float z; float w;} ImVec4_Simple; -typedef struct ImColor_Simple { ImVec4_Simple Value;} ImColor_Simple; - #ifdef CIMGUI_DEFINE_ENUMS_AND_STRUCTS typedef struct ImGuiStoragePair ImGuiStoragePair; @@ -882,28 +877,6 @@ struct ImGuiStoragePair struct GLFWwindow; struct SDL_Window; typedef union SDL_Event SDL_Event; -inline ImVec2_Simple ImVec2ToSimple(ImVec2 vec) -{ - ImVec2_Simple result; - result.x = vec.x; - result.y = vec.y; - return result; -} -inline ImVec4_Simple ImVec4ToSimple(ImVec4 vec) -{ - ImVec4_Simple result; - result.x = vec.x; - result.y = vec.y; - result.z = vec.z; - result.w = vec.w; - return result; -} -inline ImColor_Simple ImColorToSimple(ImColor col) -{ - ImColor_Simple result; - result.Value = ImVec4ToSimple(col.Value); - return result; -} #endif // CIMGUI_DEFINE_ENUMS_AND_STRUCTS #ifndef CIMGUI_DEFINE_ENUMS_AND_STRUCTS @@ -957,7 +930,7 @@ CIMGUI_API void igStyleColorsClassic(ImGuiStyle* dst); CIMGUI_API void igStyleColorsLight(ImGuiStyle* dst); CIMGUI_API bool igBegin(const char* name,bool* p_open,ImGuiWindowFlags flags); CIMGUI_API void igEnd(void); -CIMGUI_API bool igBeginChild(const char* str_id,const ImVec2 size,bool border,ImGuiWindowFlags flags); +CIMGUI_API bool igBeginChildStr(const char* str_id,const ImVec2 size,bool border,ImGuiWindowFlags flags); CIMGUI_API bool igBeginChildID(ImGuiID id,const ImVec2 size,bool border,ImGuiWindowFlags flags); CIMGUI_API void igEndChild(void); CIMGUI_API bool igIsWindowAppearing(void); @@ -1003,7 +976,7 @@ CIMGUI_API void igSetScrollFromPosY(float local_y,float center_y_ratio); CIMGUI_API void igPushFont(ImFont* font); CIMGUI_API void igPopFont(void); CIMGUI_API void igPushStyleColorU32(ImGuiCol idx,ImU32 col); -CIMGUI_API void igPushStyleColor(ImGuiCol idx,const ImVec4 col); +CIMGUI_API void igPushStyleColorVec4(ImGuiCol idx,const ImVec4 col); CIMGUI_API void igPopStyleColor(int count); CIMGUI_API void igPushStyleVarFloat(ImGuiStyleVar idx,float val); CIMGUI_API void igPushStyleVarVec2(ImGuiStyleVar idx,const ImVec2 val); @@ -1012,7 +985,7 @@ CIMGUI_API const ImVec4* igGetStyleColorVec4(ImGuiCol idx); CIMGUI_API ImFont* igGetFont(void); CIMGUI_API float igGetFontSize(void); CIMGUI_API ImVec2 igGetFontTexUvWhitePixel(void); -CIMGUI_API ImU32 igGetColorU32(ImGuiCol idx,float alpha_mul); +CIMGUI_API ImU32 igGetColorU32Col(ImGuiCol idx,float alpha_mul); CIMGUI_API ImU32 igGetColorU32Vec4(const ImVec4 col); CIMGUI_API ImU32 igGetColorU32U32(ImU32 col); CIMGUI_API void igPushItemWidth(float item_width); @@ -1049,12 +1022,12 @@ CIMGUI_API float igGetTextLineHeightWithSpacing(void); CIMGUI_API float igGetFrameHeight(void); CIMGUI_API float igGetFrameHeightWithSpacing(void); CIMGUI_API void igPushIDStr(const char* str_id); -CIMGUI_API void igPushIDRange(const char* str_id_begin,const char* str_id_end); +CIMGUI_API void igPushIDStrStr(const char* str_id_begin,const char* str_id_end); CIMGUI_API void igPushIDPtr(const void* ptr_id); CIMGUI_API void igPushIDInt(int int_id); CIMGUI_API void igPopID(void); CIMGUI_API ImGuiID igGetIDStr(const char* str_id); -CIMGUI_API ImGuiID igGetIDRange(const char* str_id_begin,const char* str_id_end); +CIMGUI_API ImGuiID igGetIDStrStr(const char* str_id_begin,const char* str_id_end); CIMGUI_API ImGuiID igGetIDPtr(const void* ptr_id); CIMGUI_API void igTextUnformatted(const char* text,const char* text_end); CIMGUI_API void igText(const char* fmt,...); @@ -1083,7 +1056,7 @@ CIMGUI_API void igProgressBar(float fraction,const ImVec2 size_arg,const char* o CIMGUI_API void igBullet(void); CIMGUI_API bool igBeginCombo(const char* label,const char* preview_value,ImGuiComboFlags flags); CIMGUI_API void igEndCombo(void); -CIMGUI_API bool igCombo(const char* label,int* current_item,const char* const items[],int items_count,int popup_max_height_in_items); +CIMGUI_API bool igComboStr_arr(const char* label,int* current_item,const char* const items[],int items_count,int popup_max_height_in_items); CIMGUI_API bool igComboStr(const char* label,int* current_item,const char* items_separated_by_zeros,int popup_max_height_in_items); CIMGUI_API bool igComboFnPtr(const char* label,int* current_item,bool(*items_getter)(void* data,int idx,const char** out_text),void* data,int items_count,int popup_max_height_in_items); CIMGUI_API bool igDragFloat(const char* label,float* v,float v_speed,float v_min,float v_max,const char* format,float power); @@ -1146,17 +1119,17 @@ CIMGUI_API void igTreePushStr(const char* str_id); CIMGUI_API void igTreePushPtr(const void* ptr_id); CIMGUI_API void igTreePop(void); CIMGUI_API float igGetTreeNodeToLabelSpacing(void); -CIMGUI_API bool igCollapsingHeader(const char* label,ImGuiTreeNodeFlags flags); +CIMGUI_API bool igCollapsingHeaderTreeNodeFlags(const char* label,ImGuiTreeNodeFlags flags); CIMGUI_API bool igCollapsingHeaderBoolPtr(const char* label,bool* p_open,ImGuiTreeNodeFlags flags); CIMGUI_API void igSetNextItemOpen(bool is_open,ImGuiCond cond); -CIMGUI_API bool igSelectable(const char* label,bool selected,ImGuiSelectableFlags flags,const ImVec2 size); +CIMGUI_API bool igSelectableBool(const char* label,bool selected,ImGuiSelectableFlags flags,const ImVec2 size); CIMGUI_API bool igSelectableBoolPtr(const char* label,bool* p_selected,ImGuiSelectableFlags flags,const ImVec2 size); CIMGUI_API bool igListBoxStr_arr(const char* label,int* current_item,const char* const items[],int items_count,int height_in_items); CIMGUI_API bool igListBoxFnPtr(const char* label,int* current_item,bool(*items_getter)(void* data,int idx,const char** out_text),void* data,int items_count,int height_in_items); CIMGUI_API bool igListBoxHeaderVec2(const char* label,const ImVec2 size); CIMGUI_API bool igListBoxHeaderInt(const char* label,int items_count,int height_in_items); CIMGUI_API void igListBoxFooter(void); -CIMGUI_API void igPlotLines(const char* label,const float* values,int values_count,int values_offset,const char* overlay_text,float scale_min,float scale_max,ImVec2 graph_size,int stride); +CIMGUI_API void igPlotLinesFloatPtr(const char* label,const float* values,int values_count,int values_offset,const char* overlay_text,float scale_min,float scale_max,ImVec2 graph_size,int stride); CIMGUI_API void igPlotLinesFnPtr(const char* label,float(*values_getter)(void* data,int idx),void* data,int values_count,int values_offset,const char* overlay_text,float scale_min,float scale_max,ImVec2 graph_size); CIMGUI_API void igPlotHistogramFloatPtr(const char* label,const float* values,int values_count,int values_offset,const char* overlay_text,float scale_min,float scale_max,ImVec2 graph_size,int stride); CIMGUI_API void igPlotHistogramFnPtr(const char* label,float(*values_getter)(void* data,int idx),void* data,int values_count,int values_offset,const char* overlay_text,float scale_min,float scale_max,ImVec2 graph_size); @@ -1384,7 +1357,7 @@ CIMGUI_API void ImDrawList_AddCircle(ImDrawList* self,const ImVec2 center,float CIMGUI_API void ImDrawList_AddCircleFilled(ImDrawList* self,const ImVec2 center,float radius,ImU32 col,int num_segments); CIMGUI_API void ImDrawList_AddNgon(ImDrawList* self,const ImVec2 center,float radius,ImU32 col,int num_segments,float thickness); CIMGUI_API void ImDrawList_AddNgonFilled(ImDrawList* self,const ImVec2 center,float radius,ImU32 col,int num_segments); -CIMGUI_API void ImDrawList_AddText(ImDrawList* self,const ImVec2 pos,ImU32 col,const char* text_begin,const char* text_end); +CIMGUI_API void ImDrawList_AddTextVec2(ImDrawList* self,const ImVec2 pos,ImU32 col,const char* text_begin,const char* text_end); CIMGUI_API void ImDrawList_AddTextFontPtr(ImDrawList* self,const ImFont* font,float font_size,const ImVec2 pos,ImU32 col,const char* text_begin,const char* text_end,float wrap_width,const ImVec4* cpu_fine_clip_rect); 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); @@ -1486,49 +1459,27 @@ CIMGUI_API void ImFont_AddGlyph(ImFont* self,ImWchar c,float x0,float y0,float x CIMGUI_API void ImFont_AddRemapChar(ImFont* self,ImWchar dst,ImWchar src,bool overwrite_dst); CIMGUI_API void ImFont_SetFallbackChar(ImFont* self,ImWchar c); CIMGUI_API void igGetWindowPos_nonUDT(ImVec2 *pOut); -CIMGUI_API ImVec2_Simple igGetWindowPos_nonUDT2(void); CIMGUI_API void igGetWindowSize_nonUDT(ImVec2 *pOut); -CIMGUI_API ImVec2_Simple igGetWindowSize_nonUDT2(void); CIMGUI_API void igGetContentRegionMax_nonUDT(ImVec2 *pOut); -CIMGUI_API ImVec2_Simple igGetContentRegionMax_nonUDT2(void); CIMGUI_API void igGetContentRegionAvail_nonUDT(ImVec2 *pOut); -CIMGUI_API ImVec2_Simple igGetContentRegionAvail_nonUDT2(void); CIMGUI_API void igGetWindowContentRegionMin_nonUDT(ImVec2 *pOut); -CIMGUI_API ImVec2_Simple igGetWindowContentRegionMin_nonUDT2(void); CIMGUI_API void igGetWindowContentRegionMax_nonUDT(ImVec2 *pOut); -CIMGUI_API ImVec2_Simple igGetWindowContentRegionMax_nonUDT2(void); CIMGUI_API void igGetFontTexUvWhitePixel_nonUDT(ImVec2 *pOut); -CIMGUI_API ImVec2_Simple igGetFontTexUvWhitePixel_nonUDT2(void); CIMGUI_API void igGetCursorPos_nonUDT(ImVec2 *pOut); -CIMGUI_API ImVec2_Simple igGetCursorPos_nonUDT2(void); CIMGUI_API void igGetCursorStartPos_nonUDT(ImVec2 *pOut); -CIMGUI_API ImVec2_Simple igGetCursorStartPos_nonUDT2(void); CIMGUI_API void igGetCursorScreenPos_nonUDT(ImVec2 *pOut); -CIMGUI_API ImVec2_Simple igGetCursorScreenPos_nonUDT2(void); CIMGUI_API void igGetItemRectMin_nonUDT(ImVec2 *pOut); -CIMGUI_API ImVec2_Simple igGetItemRectMin_nonUDT2(void); CIMGUI_API void igGetItemRectMax_nonUDT(ImVec2 *pOut); -CIMGUI_API ImVec2_Simple igGetItemRectMax_nonUDT2(void); CIMGUI_API void igGetItemRectSize_nonUDT(ImVec2 *pOut); -CIMGUI_API ImVec2_Simple igGetItemRectSize_nonUDT2(void); CIMGUI_API void igCalcTextSize_nonUDT(ImVec2 *pOut,const char* text,const char* text_end,bool hide_text_after_double_hash,float wrap_width); -CIMGUI_API ImVec2_Simple igCalcTextSize_nonUDT2(const char* text,const char* text_end,bool hide_text_after_double_hash,float wrap_width); CIMGUI_API void igColorConvertU32ToFloat4_nonUDT(ImVec4 *pOut,ImU32 in); -CIMGUI_API ImVec4_Simple igColorConvertU32ToFloat4_nonUDT2(ImU32 in); CIMGUI_API void igGetMousePos_nonUDT(ImVec2 *pOut); -CIMGUI_API ImVec2_Simple igGetMousePos_nonUDT2(void); CIMGUI_API void igGetMousePosOnOpeningCurrentPopup_nonUDT(ImVec2 *pOut); -CIMGUI_API ImVec2_Simple igGetMousePosOnOpeningCurrentPopup_nonUDT2(void); CIMGUI_API void igGetMouseDragDelta_nonUDT(ImVec2 *pOut,ImGuiMouseButton button,float lock_threshold); -CIMGUI_API ImVec2_Simple igGetMouseDragDelta_nonUDT2(ImGuiMouseButton button,float lock_threshold); CIMGUI_API void ImColor_HSV_nonUDT(ImColor *pOut,ImColor* self,float h,float s,float v,float a); -CIMGUI_API ImColor_Simple ImColor_HSV_nonUDT2(ImColor* self,float h,float s,float v,float a); CIMGUI_API void ImDrawList_GetClipRectMin_nonUDT(ImVec2 *pOut,ImDrawList* self); -CIMGUI_API ImVec2_Simple ImDrawList_GetClipRectMin_nonUDT2(ImDrawList* self); CIMGUI_API void ImDrawList_GetClipRectMax_nonUDT(ImVec2 *pOut,ImDrawList* self); -CIMGUI_API ImVec2_Simple ImDrawList_GetClipRectMax_nonUDT2(ImDrawList* self); CIMGUI_API void ImFont_CalcTextSizeA_nonUDT(ImVec2 *pOut,ImFont* self,float size,float max_width,float wrap_width,const char* text_begin,const char* text_end,const char** remaining); -CIMGUI_API ImVec2_Simple ImFont_CalcTextSizeA_nonUDT2(ImFont* self,float size,float max_width,float wrap_width,const char* text_begin,const char* text_end,const char** remaining); /////////////////////////hand written functions diff --git a/generator/output/definitions.json b/generator/output/definitions.json index ebae936..2ddfe27 100644 --- a/generator/output/definitions.json +++ b/generator/output/definitions.json @@ -76,44 +76,6 @@ "ret": "void", "signature": "(float,float,float,float)", "stname": "ImColor" - }, - { - "args": "(ImColor* self,float h,float s,float v,float a)", - "argsT": [ - { - "name": "self", - "type": "ImColor*" - }, - { - "name": "h", - "type": "float" - }, - { - "name": "s", - "type": "float" - }, - { - "name": "v", - "type": "float" - }, - { - "name": "a", - "type": "float" - } - ], - "argsoriginal": "(float h,float s,float v,float a=1.0f)", - "call_args": "(h,s,v,a)", - "cimguiname": "ImColor_HSV", - "defaults": { - "a": "1.0f" - }, - "funcname": "HSV", - "nonUDT": 2, - "ov_cimguiname": "ImColor_HSV_nonUDT2", - "ret": "ImColor_Simple", - "retorig": "ImColor", - "signature": "(float,float,float,float)", - "stname": "ImColor" } ], "ImColor_ImColor": [ @@ -1362,7 +1324,7 @@ "text_end": "((void*)0)" }, "funcname": "AddText", - "ov_cimguiname": "ImDrawList_AddText", + "ov_cimguiname": "ImDrawList_AddTextVec2", "ret": "void", "signature": "(const ImVec2,ImU32,const char*,const char*)", "stname": "ImDrawList" @@ -1669,26 +1631,6 @@ "ret": "void", "signature": "()const", "stname": "ImDrawList" - }, - { - "args": "(ImDrawList* self)", - "argsT": [ - { - "name": "self", - "type": "ImDrawList*" - } - ], - "argsoriginal": "()", - "call_args": "()", - "cimguiname": "ImDrawList_GetClipRectMax", - "defaults": [], - "funcname": "GetClipRectMax", - "nonUDT": 2, - "ov_cimguiname": "ImDrawList_GetClipRectMax_nonUDT2", - "ret": "ImVec2_Simple", - "retorig": "ImVec2", - "signature": "()const", - "stname": "ImDrawList" } ], "ImDrawList_GetClipRectMin": [ @@ -1732,26 +1674,6 @@ "ret": "void", "signature": "()const", "stname": "ImDrawList" - }, - { - "args": "(ImDrawList* self)", - "argsT": [ - { - "name": "self", - "type": "ImDrawList*" - } - ], - "argsoriginal": "()", - "call_args": "()", - "cimguiname": "ImDrawList_GetClipRectMin", - "defaults": [], - "funcname": "GetClipRectMin", - "nonUDT": 2, - "ov_cimguiname": "ImDrawList_GetClipRectMin_nonUDT2", - "ret": "ImVec2_Simple", - "retorig": "ImVec2", - "signature": "()const", - "stname": "ImDrawList" } ], "ImDrawList_ImDrawList": [ @@ -3807,53 +3729,6 @@ "ret": "void", "signature": "(float,float,float,const char*,const char*,const char**)const", "stname": "ImFont" - }, - { - "args": "(ImFont* self,float size,float max_width,float wrap_width,const char* text_begin,const char* text_end,const char** remaining)", - "argsT": [ - { - "name": "self", - "type": "ImFont*" - }, - { - "name": "size", - "type": "float" - }, - { - "name": "max_width", - "type": "float" - }, - { - "name": "wrap_width", - "type": "float" - }, - { - "name": "text_begin", - "type": "const char*" - }, - { - "name": "text_end", - "type": "const char*" - }, - { - "name": "remaining", - "type": "const char**" - } - ], - "argsoriginal": "(float size,float max_width,float wrap_width,const char* text_begin,const char* text_end=((void*)0),const char** remaining=((void*)0))", - "call_args": "(size,max_width,wrap_width,text_begin,text_end,remaining)", - "cimguiname": "ImFont_CalcTextSizeA", - "defaults": { - "remaining": "((void*)0)", - "text_end": "((void*)0)" - }, - "funcname": "CalcTextSizeA", - "nonUDT": 2, - "ov_cimguiname": "ImFont_CalcTextSizeA_nonUDT2", - "ret": "ImVec2_Simple", - "retorig": "ImVec2", - "signature": "(float,float,float,const char*,const char*,const char**)const", - "stname": "ImFont" } ], "ImFont_CalcWordWrapPositionA": [ @@ -6830,7 +6705,7 @@ }, "funcname": "BeginChild", "namespace": "ImGui", - "ov_cimguiname": "igBeginChild", + "ov_cimguiname": "igBeginChildStr", "ret": "bool", "signature": "(const char*,const ImVec2,bool,ImGuiWindowFlags)", "stname": "" @@ -7488,43 +7363,6 @@ "ret": "void", "signature": "(const char*,const char*,bool,float)", "stname": "" - }, - { - "args": "(const char* text,const char* text_end,bool hide_text_after_double_hash,float wrap_width)", - "argsT": [ - { - "name": "text", - "type": "const char*" - }, - { - "name": "text_end", - "type": "const char*" - }, - { - "name": "hide_text_after_double_hash", - "type": "bool" - }, - { - "name": "wrap_width", - "type": "float" - } - ], - "argsoriginal": "(const char* text,const char* text_end=((void*)0),bool hide_text_after_double_hash=false,float wrap_width=-1.0f)", - "call_args": "(text,text_end,hide_text_after_double_hash,wrap_width)", - "cimguiname": "igCalcTextSize", - "defaults": { - "hide_text_after_double_hash": "false", - "text_end": "((void*)0)", - "wrap_width": "-1.0f" - }, - "funcname": "CalcTextSize", - "namespace": "ImGui", - "nonUDT": 2, - "ov_cimguiname": "igCalcTextSize_nonUDT2", - "ret": "ImVec2_Simple", - "retorig": "ImVec2", - "signature": "(const char*,const char*,bool,float)", - "stname": "" } ], "igCaptureKeyboardFromApp": [ @@ -7664,7 +7502,7 @@ }, "funcname": "CollapsingHeader", "namespace": "ImGui", - "ov_cimguiname": "igCollapsingHeader", + "ov_cimguiname": "igCollapsingHeaderTreeNodeFlags", "ret": "bool", "signature": "(const char*,ImGuiTreeNodeFlags)", "stname": "" @@ -7883,27 +7721,6 @@ "ret": "void", "signature": "(ImU32)", "stname": "" - }, - { - "args": "(ImU32 in)", - "argsT": [ - { - "name": "in", - "type": "ImU32" - } - ], - "argsoriginal": "(ImU32 in)", - "call_args": "(in)", - "cimguiname": "igColorConvertU32ToFloat4", - "defaults": [], - "funcname": "ColorConvertU32ToFloat4", - "namespace": "ImGui", - "nonUDT": 2, - "ov_cimguiname": "igColorConvertU32ToFloat4_nonUDT2", - "ret": "ImVec4_Simple", - "retorig": "ImVec4", - "signature": "(ImU32)", - "stname": "" } ], "igColorEdit3": [ @@ -8101,7 +7918,7 @@ }, "funcname": "Combo", "namespace": "ImGui", - "ov_cimguiname": "igCombo", + "ov_cimguiname": "igComboStr_arr", "ret": "bool", "signature": "(const char*,int*,const char* const[],int,int)", "stname": "" @@ -9203,7 +9020,7 @@ }, "funcname": "GetColorU32", "namespace": "ImGui", - "ov_cimguiname": "igGetColorU32", + "ov_cimguiname": "igGetColorU32Col", "ret": "ImU32", "signature": "(ImGuiCol,float)", "stname": "" @@ -9359,22 +9176,6 @@ "ret": "void", "signature": "()", "stname": "" - }, - { - "args": "()", - "argsT": [], - "argsoriginal": "()", - "call_args": "()", - "cimguiname": "igGetContentRegionAvail", - "defaults": [], - "funcname": "GetContentRegionAvail", - "namespace": "ImGui", - "nonUDT": 2, - "ov_cimguiname": "igGetContentRegionAvail_nonUDT2", - "ret": "ImVec2_Simple", - "retorig": "ImVec2", - "signature": "()", - "stname": "" } ], "igGetContentRegionMax": [ @@ -9411,22 +9212,6 @@ "ret": "void", "signature": "()", "stname": "" - }, - { - "args": "()", - "argsT": [], - "argsoriginal": "()", - "call_args": "()", - "cimguiname": "igGetContentRegionMax", - "defaults": [], - "funcname": "GetContentRegionMax", - "namespace": "ImGui", - "nonUDT": 2, - "ov_cimguiname": "igGetContentRegionMax_nonUDT2", - "ret": "ImVec2_Simple", - "retorig": "ImVec2", - "signature": "()", - "stname": "" } ], "igGetCurrentContext": [ @@ -9479,22 +9264,6 @@ "ret": "void", "signature": "()", "stname": "" - }, - { - "args": "()", - "argsT": [], - "argsoriginal": "()", - "call_args": "()", - "cimguiname": "igGetCursorPos", - "defaults": [], - "funcname": "GetCursorPos", - "namespace": "ImGui", - "nonUDT": 2, - "ov_cimguiname": "igGetCursorPos_nonUDT2", - "ret": "ImVec2_Simple", - "retorig": "ImVec2", - "signature": "()", - "stname": "" } ], "igGetCursorPosX": [ @@ -9563,22 +9332,6 @@ "ret": "void", "signature": "()", "stname": "" - }, - { - "args": "()", - "argsT": [], - "argsoriginal": "()", - "call_args": "()", - "cimguiname": "igGetCursorScreenPos", - "defaults": [], - "funcname": "GetCursorScreenPos", - "namespace": "ImGui", - "nonUDT": 2, - "ov_cimguiname": "igGetCursorScreenPos_nonUDT2", - "ret": "ImVec2_Simple", - "retorig": "ImVec2", - "signature": "()", - "stname": "" } ], "igGetCursorStartPos": [ @@ -9615,22 +9368,6 @@ "ret": "void", "signature": "()", "stname": "" - }, - { - "args": "()", - "argsT": [], - "argsoriginal": "()", - "call_args": "()", - "cimguiname": "igGetCursorStartPos", - "defaults": [], - "funcname": "GetCursorStartPos", - "namespace": "ImGui", - "nonUDT": 2, - "ov_cimguiname": "igGetCursorStartPos_nonUDT2", - "ret": "ImVec2_Simple", - "retorig": "ImVec2", - "signature": "()", - "stname": "" } ], "igGetDragDropPayload": [ @@ -9747,22 +9484,6 @@ "ret": "void", "signature": "()", "stname": "" - }, - { - "args": "()", - "argsT": [], - "argsoriginal": "()", - "call_args": "()", - "cimguiname": "igGetFontTexUvWhitePixel", - "defaults": [], - "funcname": "GetFontTexUvWhitePixel", - "namespace": "ImGui", - "nonUDT": 2, - "ov_cimguiname": "igGetFontTexUvWhitePixel_nonUDT2", - "ret": "ImVec2_Simple", - "retorig": "ImVec2", - "signature": "()", - "stname": "" } ], "igGetForegroundDrawList": [ @@ -9867,7 +9588,7 @@ "defaults": [], "funcname": "GetID", "namespace": "ImGui", - "ov_cimguiname": "igGetIDRange", + "ov_cimguiname": "igGetIDStrStr", "ret": "ImGuiID", "signature": "(const char*,const char*)", "stname": "" @@ -9943,22 +9664,6 @@ "ret": "void", "signature": "()", "stname": "" - }, - { - "args": "()", - "argsT": [], - "argsoriginal": "()", - "call_args": "()", - "cimguiname": "igGetItemRectMax", - "defaults": [], - "funcname": "GetItemRectMax", - "namespace": "ImGui", - "nonUDT": 2, - "ov_cimguiname": "igGetItemRectMax_nonUDT2", - "ret": "ImVec2_Simple", - "retorig": "ImVec2", - "signature": "()", - "stname": "" } ], "igGetItemRectMin": [ @@ -9995,22 +9700,6 @@ "ret": "void", "signature": "()", "stname": "" - }, - { - "args": "()", - "argsT": [], - "argsoriginal": "()", - "call_args": "()", - "cimguiname": "igGetItemRectMin", - "defaults": [], - "funcname": "GetItemRectMin", - "namespace": "ImGui", - "nonUDT": 2, - "ov_cimguiname": "igGetItemRectMin_nonUDT2", - "ret": "ImVec2_Simple", - "retorig": "ImVec2", - "signature": "()", - "stname": "" } ], "igGetItemRectSize": [ @@ -10047,22 +9736,6 @@ "ret": "void", "signature": "()", "stname": "" - }, - { - "args": "()", - "argsT": [], - "argsoriginal": "()", - "call_args": "()", - "cimguiname": "igGetItemRectSize", - "defaults": [], - "funcname": "GetItemRectSize", - "namespace": "ImGui", - "nonUDT": 2, - "ov_cimguiname": "igGetItemRectSize_nonUDT2", - "ret": "ImVec2_Simple", - "retorig": "ImVec2", - "signature": "()", - "stname": "" } ], "igGetKeyIndex": [ @@ -10188,34 +9861,6 @@ "ret": "void", "signature": "(ImGuiMouseButton,float)", "stname": "" - }, - { - "args": "(ImGuiMouseButton button,float lock_threshold)", - "argsT": [ - { - "name": "button", - "type": "ImGuiMouseButton" - }, - { - "name": "lock_threshold", - "type": "float" - } - ], - "argsoriginal": "(ImGuiMouseButton button=0,float lock_threshold=-1.0f)", - "call_args": "(button,lock_threshold)", - "cimguiname": "igGetMouseDragDelta", - "defaults": { - "button": "0", - "lock_threshold": "-1.0f" - }, - "funcname": "GetMouseDragDelta", - "namespace": "ImGui", - "nonUDT": 2, - "ov_cimguiname": "igGetMouseDragDelta_nonUDT2", - "ret": "ImVec2_Simple", - "retorig": "ImVec2", - "signature": "(ImGuiMouseButton,float)", - "stname": "" } ], "igGetMousePos": [ @@ -10252,22 +9897,6 @@ "ret": "void", "signature": "()", "stname": "" - }, - { - "args": "()", - "argsT": [], - "argsoriginal": "()", - "call_args": "()", - "cimguiname": "igGetMousePos", - "defaults": [], - "funcname": "GetMousePos", - "namespace": "ImGui", - "nonUDT": 2, - "ov_cimguiname": "igGetMousePos_nonUDT2", - "ret": "ImVec2_Simple", - "retorig": "ImVec2", - "signature": "()", - "stname": "" } ], "igGetMousePosOnOpeningCurrentPopup": [ @@ -10304,22 +9933,6 @@ "ret": "void", "signature": "()", "stname": "" - }, - { - "args": "()", - "argsT": [], - "argsoriginal": "()", - "call_args": "()", - "cimguiname": "igGetMousePosOnOpeningCurrentPopup", - "defaults": [], - "funcname": "GetMousePosOnOpeningCurrentPopup", - "namespace": "ImGui", - "nonUDT": 2, - "ov_cimguiname": "igGetMousePosOnOpeningCurrentPopup_nonUDT2", - "ret": "ImVec2_Simple", - "retorig": "ImVec2", - "signature": "()", - "stname": "" } ], "igGetScrollMaxX": [ @@ -10576,22 +10189,6 @@ "ret": "void", "signature": "()", "stname": "" - }, - { - "args": "()", - "argsT": [], - "argsoriginal": "()", - "call_args": "()", - "cimguiname": "igGetWindowContentRegionMax", - "defaults": [], - "funcname": "GetWindowContentRegionMax", - "namespace": "ImGui", - "nonUDT": 2, - "ov_cimguiname": "igGetWindowContentRegionMax_nonUDT2", - "ret": "ImVec2_Simple", - "retorig": "ImVec2", - "signature": "()", - "stname": "" } ], "igGetWindowContentRegionMin": [ @@ -10628,22 +10225,6 @@ "ret": "void", "signature": "()", "stname": "" - }, - { - "args": "()", - "argsT": [], - "argsoriginal": "()", - "call_args": "()", - "cimguiname": "igGetWindowContentRegionMin", - "defaults": [], - "funcname": "GetWindowContentRegionMin", - "namespace": "ImGui", - "nonUDT": 2, - "ov_cimguiname": "igGetWindowContentRegionMin_nonUDT2", - "ret": "ImVec2_Simple", - "retorig": "ImVec2", - "signature": "()", - "stname": "" } ], "igGetWindowContentRegionWidth": [ @@ -10728,22 +10309,6 @@ "ret": "void", "signature": "()", "stname": "" - }, - { - "args": "()", - "argsT": [], - "argsoriginal": "()", - "call_args": "()", - "cimguiname": "igGetWindowPos", - "defaults": [], - "funcname": "GetWindowPos", - "namespace": "ImGui", - "nonUDT": 2, - "ov_cimguiname": "igGetWindowPos_nonUDT2", - "ret": "ImVec2_Simple", - "retorig": "ImVec2", - "signature": "()", - "stname": "" } ], "igGetWindowSize": [ @@ -10780,22 +10345,6 @@ "ret": "void", "signature": "()", "stname": "" - }, - { - "args": "()", - "argsT": [], - "argsoriginal": "()", - "call_args": "()", - "cimguiname": "igGetWindowSize", - "defaults": [], - "funcname": "GetWindowSize", - "namespace": "ImGui", - "nonUDT": 2, - "ov_cimguiname": "igGetWindowSize_nonUDT2", - "ret": "ImVec2_Simple", - "retorig": "ImVec2", - "signature": "()", - "stname": "" } ], "igGetWindowWidth": [ @@ -12938,7 +12487,7 @@ }, "funcname": "PlotLines", "namespace": "ImGui", - "ov_cimguiname": "igPlotLines", + "ov_cimguiname": "igPlotLinesFloatPtr", "ret": "void", "signature": "(const char*,const float*,int,int,const char*,float,float,ImVec2,int)", "stname": "" @@ -13323,7 +12872,7 @@ "defaults": [], "funcname": "PushID", "namespace": "ImGui", - "ov_cimguiname": "igPushIDRange", + "ov_cimguiname": "igPushIDStrStr", "ret": "void", "signature": "(const char*,const char*)", "stname": "" @@ -13430,7 +12979,7 @@ "defaults": [], "funcname": "PushStyleColor", "namespace": "ImGui", - "ov_cimguiname": "igPushStyleColor", + "ov_cimguiname": "igPushStyleColorVec4", "ret": "void", "signature": "(ImGuiCol,const ImVec4)", "stname": "" @@ -13701,7 +13250,7 @@ }, "funcname": "Selectable", "namespace": "ImGui", - "ov_cimguiname": "igSelectable", + "ov_cimguiname": "igSelectableBool", "ret": "bool", "signature": "(const char*,bool,ImGuiSelectableFlags,const ImVec2)", "stname": "" diff --git a/generator/output/definitions.lua b/generator/output/definitions.lua index 2bb2ba2..27bb8ae 100644 --- a/generator/output/definitions.lua +++ b/generator/output/definitions.lua @@ -59,38 +59,8 @@ defs["ImColor_HSV"][2]["ov_cimguiname"] = "ImColor_HSV_nonUDT" defs["ImColor_HSV"][2]["ret"] = "void" defs["ImColor_HSV"][2]["signature"] = "(float,float,float,float)" defs["ImColor_HSV"][2]["stname"] = "ImColor" -defs["ImColor_HSV"][3] = {} -defs["ImColor_HSV"][3]["args"] = "(ImColor* self,float h,float s,float v,float a)" -defs["ImColor_HSV"][3]["argsT"] = {} -defs["ImColor_HSV"][3]["argsT"][1] = {} -defs["ImColor_HSV"][3]["argsT"][1]["name"] = "self" -defs["ImColor_HSV"][3]["argsT"][1]["type"] = "ImColor*" -defs["ImColor_HSV"][3]["argsT"][2] = {} -defs["ImColor_HSV"][3]["argsT"][2]["name"] = "h" -defs["ImColor_HSV"][3]["argsT"][2]["type"] = "float" -defs["ImColor_HSV"][3]["argsT"][3] = {} -defs["ImColor_HSV"][3]["argsT"][3]["name"] = "s" -defs["ImColor_HSV"][3]["argsT"][3]["type"] = "float" -defs["ImColor_HSV"][3]["argsT"][4] = {} -defs["ImColor_HSV"][3]["argsT"][4]["name"] = "v" -defs["ImColor_HSV"][3]["argsT"][4]["type"] = "float" -defs["ImColor_HSV"][3]["argsT"][5] = {} -defs["ImColor_HSV"][3]["argsT"][5]["name"] = "a" -defs["ImColor_HSV"][3]["argsT"][5]["type"] = "float" -defs["ImColor_HSV"][3]["argsoriginal"] = "(float h,float s,float v,float a=1.0f)" -defs["ImColor_HSV"][3]["call_args"] = "(h,s,v,a)" -defs["ImColor_HSV"][3]["cimguiname"] = "ImColor_HSV" -defs["ImColor_HSV"][3]["defaults"] = defs["ImColor_HSV"][1]["defaults"] -defs["ImColor_HSV"][3]["funcname"] = "HSV" -defs["ImColor_HSV"][3]["nonUDT"] = 2 -defs["ImColor_HSV"][3]["ov_cimguiname"] = "ImColor_HSV_nonUDT2" -defs["ImColor_HSV"][3]["ret"] = "ImColor_Simple" -defs["ImColor_HSV"][3]["retorig"] = "ImColor" -defs["ImColor_HSV"][3]["signature"] = "(float,float,float,float)" -defs["ImColor_HSV"][3]["stname"] = "ImColor" defs["ImColor_HSV"]["(float,float,float,float)"] = defs["ImColor_HSV"][1] defs["ImColor_HSV"]["(float,float,float,float)nonUDT"] = defs["ImColor_HSV"][2] -defs["ImColor_HSV"]["(float,float,float,float)nonUDT2"] = defs["ImColor_HSV"][3] defs["ImColor_ImColor"] = {} defs["ImColor_ImColor"][1] = {} defs["ImColor_ImColor"][1]["args"] = "()" @@ -1104,7 +1074,7 @@ defs["ImDrawList_AddText"][1]["cimguiname"] = "ImDrawList_AddText" defs["ImDrawList_AddText"][1]["defaults"] = {} defs["ImDrawList_AddText"][1]["defaults"]["text_end"] = "((void*)0)" defs["ImDrawList_AddText"][1]["funcname"] = "AddText" -defs["ImDrawList_AddText"][1]["ov_cimguiname"] = "ImDrawList_AddText" +defs["ImDrawList_AddText"][1]["ov_cimguiname"] = "ImDrawList_AddTextVec2" defs["ImDrawList_AddText"][1]["ret"] = "void" defs["ImDrawList_AddText"][1]["signature"] = "(const ImVec2,ImU32,const char*,const char*)" defs["ImDrawList_AddText"][1]["stname"] = "ImDrawList" @@ -1357,26 +1327,8 @@ defs["ImDrawList_GetClipRectMax"][2]["ov_cimguiname"] = "ImDrawList_GetClipRectM defs["ImDrawList_GetClipRectMax"][2]["ret"] = "void" defs["ImDrawList_GetClipRectMax"][2]["signature"] = "()const" defs["ImDrawList_GetClipRectMax"][2]["stname"] = "ImDrawList" -defs["ImDrawList_GetClipRectMax"][3] = {} -defs["ImDrawList_GetClipRectMax"][3]["args"] = "(ImDrawList* self)" -defs["ImDrawList_GetClipRectMax"][3]["argsT"] = {} -defs["ImDrawList_GetClipRectMax"][3]["argsT"][1] = {} -defs["ImDrawList_GetClipRectMax"][3]["argsT"][1]["name"] = "self" -defs["ImDrawList_GetClipRectMax"][3]["argsT"][1]["type"] = "ImDrawList*" -defs["ImDrawList_GetClipRectMax"][3]["argsoriginal"] = "()" -defs["ImDrawList_GetClipRectMax"][3]["call_args"] = "()" -defs["ImDrawList_GetClipRectMax"][3]["cimguiname"] = "ImDrawList_GetClipRectMax" -defs["ImDrawList_GetClipRectMax"][3]["defaults"] = defs["ImDrawList_GetClipRectMax"][1]["defaults"] -defs["ImDrawList_GetClipRectMax"][3]["funcname"] = "GetClipRectMax" -defs["ImDrawList_GetClipRectMax"][3]["nonUDT"] = 2 -defs["ImDrawList_GetClipRectMax"][3]["ov_cimguiname"] = "ImDrawList_GetClipRectMax_nonUDT2" -defs["ImDrawList_GetClipRectMax"][3]["ret"] = "ImVec2_Simple" -defs["ImDrawList_GetClipRectMax"][3]["retorig"] = "ImVec2" -defs["ImDrawList_GetClipRectMax"][3]["signature"] = "()const" -defs["ImDrawList_GetClipRectMax"][3]["stname"] = "ImDrawList" defs["ImDrawList_GetClipRectMax"]["()const"] = defs["ImDrawList_GetClipRectMax"][1] defs["ImDrawList_GetClipRectMax"]["()constnonUDT"] = defs["ImDrawList_GetClipRectMax"][2] -defs["ImDrawList_GetClipRectMax"]["()constnonUDT2"] = defs["ImDrawList_GetClipRectMax"][3] defs["ImDrawList_GetClipRectMin"] = {} defs["ImDrawList_GetClipRectMin"][1] = {} defs["ImDrawList_GetClipRectMin"][1]["args"] = "(ImDrawList* self)" @@ -1412,26 +1364,8 @@ defs["ImDrawList_GetClipRectMin"][2]["ov_cimguiname"] = "ImDrawList_GetClipRectM defs["ImDrawList_GetClipRectMin"][2]["ret"] = "void" defs["ImDrawList_GetClipRectMin"][2]["signature"] = "()const" defs["ImDrawList_GetClipRectMin"][2]["stname"] = "ImDrawList" -defs["ImDrawList_GetClipRectMin"][3] = {} -defs["ImDrawList_GetClipRectMin"][3]["args"] = "(ImDrawList* self)" -defs["ImDrawList_GetClipRectMin"][3]["argsT"] = {} -defs["ImDrawList_GetClipRectMin"][3]["argsT"][1] = {} -defs["ImDrawList_GetClipRectMin"][3]["argsT"][1]["name"] = "self" -defs["ImDrawList_GetClipRectMin"][3]["argsT"][1]["type"] = "ImDrawList*" -defs["ImDrawList_GetClipRectMin"][3]["argsoriginal"] = "()" -defs["ImDrawList_GetClipRectMin"][3]["call_args"] = "()" -defs["ImDrawList_GetClipRectMin"][3]["cimguiname"] = "ImDrawList_GetClipRectMin" -defs["ImDrawList_GetClipRectMin"][3]["defaults"] = defs["ImDrawList_GetClipRectMin"][1]["defaults"] -defs["ImDrawList_GetClipRectMin"][3]["funcname"] = "GetClipRectMin" -defs["ImDrawList_GetClipRectMin"][3]["nonUDT"] = 2 -defs["ImDrawList_GetClipRectMin"][3]["ov_cimguiname"] = "ImDrawList_GetClipRectMin_nonUDT2" -defs["ImDrawList_GetClipRectMin"][3]["ret"] = "ImVec2_Simple" -defs["ImDrawList_GetClipRectMin"][3]["retorig"] = "ImVec2" -defs["ImDrawList_GetClipRectMin"][3]["signature"] = "()const" -defs["ImDrawList_GetClipRectMin"][3]["stname"] = "ImDrawList" defs["ImDrawList_GetClipRectMin"]["()const"] = defs["ImDrawList_GetClipRectMin"][1] defs["ImDrawList_GetClipRectMin"]["()constnonUDT"] = defs["ImDrawList_GetClipRectMin"][2] -defs["ImDrawList_GetClipRectMin"]["()constnonUDT2"] = defs["ImDrawList_GetClipRectMin"][3] defs["ImDrawList_ImDrawList"] = {} defs["ImDrawList_ImDrawList"][1] = {} defs["ImDrawList_ImDrawList"][1]["args"] = "(const ImDrawListSharedData* shared_data)" @@ -3115,44 +3049,8 @@ defs["ImFont_CalcTextSizeA"][2]["ov_cimguiname"] = "ImFont_CalcTextSizeA_nonUDT" defs["ImFont_CalcTextSizeA"][2]["ret"] = "void" defs["ImFont_CalcTextSizeA"][2]["signature"] = "(float,float,float,const char*,const char*,const char**)const" defs["ImFont_CalcTextSizeA"][2]["stname"] = "ImFont" -defs["ImFont_CalcTextSizeA"][3] = {} -defs["ImFont_CalcTextSizeA"][3]["args"] = "(ImFont* self,float size,float max_width,float wrap_width,const char* text_begin,const char* text_end,const char** remaining)" -defs["ImFont_CalcTextSizeA"][3]["argsT"] = {} -defs["ImFont_CalcTextSizeA"][3]["argsT"][1] = {} -defs["ImFont_CalcTextSizeA"][3]["argsT"][1]["name"] = "self" -defs["ImFont_CalcTextSizeA"][3]["argsT"][1]["type"] = "ImFont*" -defs["ImFont_CalcTextSizeA"][3]["argsT"][2] = {} -defs["ImFont_CalcTextSizeA"][3]["argsT"][2]["name"] = "size" -defs["ImFont_CalcTextSizeA"][3]["argsT"][2]["type"] = "float" -defs["ImFont_CalcTextSizeA"][3]["argsT"][3] = {} -defs["ImFont_CalcTextSizeA"][3]["argsT"][3]["name"] = "max_width" -defs["ImFont_CalcTextSizeA"][3]["argsT"][3]["type"] = "float" -defs["ImFont_CalcTextSizeA"][3]["argsT"][4] = {} -defs["ImFont_CalcTextSizeA"][3]["argsT"][4]["name"] = "wrap_width" -defs["ImFont_CalcTextSizeA"][3]["argsT"][4]["type"] = "float" -defs["ImFont_CalcTextSizeA"][3]["argsT"][5] = {} -defs["ImFont_CalcTextSizeA"][3]["argsT"][5]["name"] = "text_begin" -defs["ImFont_CalcTextSizeA"][3]["argsT"][5]["type"] = "const char*" -defs["ImFont_CalcTextSizeA"][3]["argsT"][6] = {} -defs["ImFont_CalcTextSizeA"][3]["argsT"][6]["name"] = "text_end" -defs["ImFont_CalcTextSizeA"][3]["argsT"][6]["type"] = "const char*" -defs["ImFont_CalcTextSizeA"][3]["argsT"][7] = {} -defs["ImFont_CalcTextSizeA"][3]["argsT"][7]["name"] = "remaining" -defs["ImFont_CalcTextSizeA"][3]["argsT"][7]["type"] = "const char**" -defs["ImFont_CalcTextSizeA"][3]["argsoriginal"] = "(float size,float max_width,float wrap_width,const char* text_begin,const char* text_end=((void*)0),const char** remaining=((void*)0))" -defs["ImFont_CalcTextSizeA"][3]["call_args"] = "(size,max_width,wrap_width,text_begin,text_end,remaining)" -defs["ImFont_CalcTextSizeA"][3]["cimguiname"] = "ImFont_CalcTextSizeA" -defs["ImFont_CalcTextSizeA"][3]["defaults"] = defs["ImFont_CalcTextSizeA"][1]["defaults"] -defs["ImFont_CalcTextSizeA"][3]["funcname"] = "CalcTextSizeA" -defs["ImFont_CalcTextSizeA"][3]["nonUDT"] = 2 -defs["ImFont_CalcTextSizeA"][3]["ov_cimguiname"] = "ImFont_CalcTextSizeA_nonUDT2" -defs["ImFont_CalcTextSizeA"][3]["ret"] = "ImVec2_Simple" -defs["ImFont_CalcTextSizeA"][3]["retorig"] = "ImVec2" -defs["ImFont_CalcTextSizeA"][3]["signature"] = "(float,float,float,const char*,const char*,const char**)const" -defs["ImFont_CalcTextSizeA"][3]["stname"] = "ImFont" defs["ImFont_CalcTextSizeA"]["(float,float,float,const char*,const char*,const char**)const"] = defs["ImFont_CalcTextSizeA"][1] defs["ImFont_CalcTextSizeA"]["(float,float,float,const char*,const char*,const char**)constnonUDT"] = defs["ImFont_CalcTextSizeA"][2] -defs["ImFont_CalcTextSizeA"]["(float,float,float,const char*,const char*,const char**)constnonUDT2"] = defs["ImFont_CalcTextSizeA"][3] defs["ImFont_CalcWordWrapPositionA"] = {} defs["ImFont_CalcWordWrapPositionA"][1] = {} defs["ImFont_CalcWordWrapPositionA"][1]["args"] = "(ImFont* self,float scale,const char* text,const char* text_end,float wrap_width)" @@ -5655,7 +5553,7 @@ defs["igBeginChild"][1]["defaults"]["flags"] = "0" defs["igBeginChild"][1]["defaults"]["size"] = "ImVec2(0,0)" defs["igBeginChild"][1]["funcname"] = "BeginChild" defs["igBeginChild"][1]["namespace"] = "ImGui" -defs["igBeginChild"][1]["ov_cimguiname"] = "igBeginChild" +defs["igBeginChild"][1]["ov_cimguiname"] = "igBeginChildStr" defs["igBeginChild"][1]["ret"] = "bool" defs["igBeginChild"][1]["signature"] = "(const char*,const ImVec2,bool,ImGuiWindowFlags)" defs["igBeginChild"][1]["stname"] = "" @@ -6204,36 +6102,8 @@ defs["igCalcTextSize"][2]["ov_cimguiname"] = "igCalcTextSize_nonUDT" defs["igCalcTextSize"][2]["ret"] = "void" defs["igCalcTextSize"][2]["signature"] = "(const char*,const char*,bool,float)" defs["igCalcTextSize"][2]["stname"] = "" -defs["igCalcTextSize"][3] = {} -defs["igCalcTextSize"][3]["args"] = "(const char* text,const char* text_end,bool hide_text_after_double_hash,float wrap_width)" -defs["igCalcTextSize"][3]["argsT"] = {} -defs["igCalcTextSize"][3]["argsT"][1] = {} -defs["igCalcTextSize"][3]["argsT"][1]["name"] = "text" -defs["igCalcTextSize"][3]["argsT"][1]["type"] = "const char*" -defs["igCalcTextSize"][3]["argsT"][2] = {} -defs["igCalcTextSize"][3]["argsT"][2]["name"] = "text_end" -defs["igCalcTextSize"][3]["argsT"][2]["type"] = "const char*" -defs["igCalcTextSize"][3]["argsT"][3] = {} -defs["igCalcTextSize"][3]["argsT"][3]["name"] = "hide_text_after_double_hash" -defs["igCalcTextSize"][3]["argsT"][3]["type"] = "bool" -defs["igCalcTextSize"][3]["argsT"][4] = {} -defs["igCalcTextSize"][3]["argsT"][4]["name"] = "wrap_width" -defs["igCalcTextSize"][3]["argsT"][4]["type"] = "float" -defs["igCalcTextSize"][3]["argsoriginal"] = "(const char* text,const char* text_end=((void*)0),bool hide_text_after_double_hash=false,float wrap_width=-1.0f)" -defs["igCalcTextSize"][3]["call_args"] = "(text,text_end,hide_text_after_double_hash,wrap_width)" -defs["igCalcTextSize"][3]["cimguiname"] = "igCalcTextSize" -defs["igCalcTextSize"][3]["defaults"] = defs["igCalcTextSize"][1]["defaults"] -defs["igCalcTextSize"][3]["funcname"] = "CalcTextSize" -defs["igCalcTextSize"][3]["namespace"] = "ImGui" -defs["igCalcTextSize"][3]["nonUDT"] = 2 -defs["igCalcTextSize"][3]["ov_cimguiname"] = "igCalcTextSize_nonUDT2" -defs["igCalcTextSize"][3]["ret"] = "ImVec2_Simple" -defs["igCalcTextSize"][3]["retorig"] = "ImVec2" -defs["igCalcTextSize"][3]["signature"] = "(const char*,const char*,bool,float)" -defs["igCalcTextSize"][3]["stname"] = "" defs["igCalcTextSize"]["(const char*,const char*,bool,float)"] = defs["igCalcTextSize"][1] defs["igCalcTextSize"]["(const char*,const char*,bool,float)nonUDT"] = defs["igCalcTextSize"][2] -defs["igCalcTextSize"]["(const char*,const char*,bool,float)nonUDT2"] = defs["igCalcTextSize"][3] defs["igCaptureKeyboardFromApp"] = {} defs["igCaptureKeyboardFromApp"][1] = {} defs["igCaptureKeyboardFromApp"][1]["args"] = "(bool want_capture_keyboard_value)" @@ -6349,7 +6219,7 @@ defs["igCollapsingHeader"][1]["defaults"] = {} defs["igCollapsingHeader"][1]["defaults"]["flags"] = "0" defs["igCollapsingHeader"][1]["funcname"] = "CollapsingHeader" defs["igCollapsingHeader"][1]["namespace"] = "ImGui" -defs["igCollapsingHeader"][1]["ov_cimguiname"] = "igCollapsingHeader" +defs["igCollapsingHeader"][1]["ov_cimguiname"] = "igCollapsingHeaderTreeNodeFlags" defs["igCollapsingHeader"][1]["ret"] = "bool" defs["igCollapsingHeader"][1]["signature"] = "(const char*,ImGuiTreeNodeFlags)" defs["igCollapsingHeader"][1]["stname"] = "" @@ -6530,27 +6400,8 @@ defs["igColorConvertU32ToFloat4"][2]["ov_cimguiname"] = "igColorConvertU32ToFloa defs["igColorConvertU32ToFloat4"][2]["ret"] = "void" defs["igColorConvertU32ToFloat4"][2]["signature"] = "(ImU32)" defs["igColorConvertU32ToFloat4"][2]["stname"] = "" -defs["igColorConvertU32ToFloat4"][3] = {} -defs["igColorConvertU32ToFloat4"][3]["args"] = "(ImU32 in)" -defs["igColorConvertU32ToFloat4"][3]["argsT"] = {} -defs["igColorConvertU32ToFloat4"][3]["argsT"][1] = {} -defs["igColorConvertU32ToFloat4"][3]["argsT"][1]["name"] = "in" -defs["igColorConvertU32ToFloat4"][3]["argsT"][1]["type"] = "ImU32" -defs["igColorConvertU32ToFloat4"][3]["argsoriginal"] = "(ImU32 in)" -defs["igColorConvertU32ToFloat4"][3]["call_args"] = "(in)" -defs["igColorConvertU32ToFloat4"][3]["cimguiname"] = "igColorConvertU32ToFloat4" -defs["igColorConvertU32ToFloat4"][3]["defaults"] = defs["igColorConvertU32ToFloat4"][1]["defaults"] -defs["igColorConvertU32ToFloat4"][3]["funcname"] = "ColorConvertU32ToFloat4" -defs["igColorConvertU32ToFloat4"][3]["namespace"] = "ImGui" -defs["igColorConvertU32ToFloat4"][3]["nonUDT"] = 2 -defs["igColorConvertU32ToFloat4"][3]["ov_cimguiname"] = "igColorConvertU32ToFloat4_nonUDT2" -defs["igColorConvertU32ToFloat4"][3]["ret"] = "ImVec4_Simple" -defs["igColorConvertU32ToFloat4"][3]["retorig"] = "ImVec4" -defs["igColorConvertU32ToFloat4"][3]["signature"] = "(ImU32)" -defs["igColorConvertU32ToFloat4"][3]["stname"] = "" defs["igColorConvertU32ToFloat4"]["(ImU32)"] = defs["igColorConvertU32ToFloat4"][1] defs["igColorConvertU32ToFloat4"]["(ImU32)nonUDT"] = defs["igColorConvertU32ToFloat4"][2] -defs["igColorConvertU32ToFloat4"]["(ImU32)nonUDT2"] = defs["igColorConvertU32ToFloat4"][3] defs["igColorEdit3"] = {} defs["igColorEdit3"][1] = {} defs["igColorEdit3"][1]["args"] = "(const char* label,float col[3],ImGuiColorEditFlags flags)" @@ -6708,7 +6559,7 @@ defs["igCombo"][1]["defaults"] = {} defs["igCombo"][1]["defaults"]["popup_max_height_in_items"] = "-1" defs["igCombo"][1]["funcname"] = "Combo" defs["igCombo"][1]["namespace"] = "ImGui" -defs["igCombo"][1]["ov_cimguiname"] = "igCombo" +defs["igCombo"][1]["ov_cimguiname"] = "igComboStr_arr" defs["igCombo"][1]["ret"] = "bool" defs["igCombo"][1]["signature"] = "(const char*,int*,const char* const[],int,int)" defs["igCombo"][1]["stname"] = "" @@ -7632,7 +7483,7 @@ defs["igGetColorU32"][1]["defaults"] = {} defs["igGetColorU32"][1]["defaults"]["alpha_mul"] = "1.0f" defs["igGetColorU32"][1]["funcname"] = "GetColorU32" defs["igGetColorU32"][1]["namespace"] = "ImGui" -defs["igGetColorU32"][1]["ov_cimguiname"] = "igGetColorU32" +defs["igGetColorU32"][1]["ov_cimguiname"] = "igGetColorU32Col" defs["igGetColorU32"][1]["ret"] = "ImU32" defs["igGetColorU32"][1]["signature"] = "(ImGuiCol,float)" defs["igGetColorU32"][1]["stname"] = "" @@ -7770,24 +7621,8 @@ defs["igGetContentRegionAvail"][2]["ov_cimguiname"] = "igGetContentRegionAvail_n defs["igGetContentRegionAvail"][2]["ret"] = "void" defs["igGetContentRegionAvail"][2]["signature"] = "()" defs["igGetContentRegionAvail"][2]["stname"] = "" -defs["igGetContentRegionAvail"][3] = {} -defs["igGetContentRegionAvail"][3]["args"] = "()" -defs["igGetContentRegionAvail"][3]["argsT"] = {} -defs["igGetContentRegionAvail"][3]["argsoriginal"] = "()" -defs["igGetContentRegionAvail"][3]["call_args"] = "()" -defs["igGetContentRegionAvail"][3]["cimguiname"] = "igGetContentRegionAvail" -defs["igGetContentRegionAvail"][3]["defaults"] = defs["igGetContentRegionAvail"][1]["defaults"] -defs["igGetContentRegionAvail"][3]["funcname"] = "GetContentRegionAvail" -defs["igGetContentRegionAvail"][3]["namespace"] = "ImGui" -defs["igGetContentRegionAvail"][3]["nonUDT"] = 2 -defs["igGetContentRegionAvail"][3]["ov_cimguiname"] = "igGetContentRegionAvail_nonUDT2" -defs["igGetContentRegionAvail"][3]["ret"] = "ImVec2_Simple" -defs["igGetContentRegionAvail"][3]["retorig"] = "ImVec2" -defs["igGetContentRegionAvail"][3]["signature"] = "()" -defs["igGetContentRegionAvail"][3]["stname"] = "" defs["igGetContentRegionAvail"]["()"] = defs["igGetContentRegionAvail"][1] defs["igGetContentRegionAvail"]["()nonUDT"] = defs["igGetContentRegionAvail"][2] -defs["igGetContentRegionAvail"]["()nonUDT2"] = defs["igGetContentRegionAvail"][3] defs["igGetContentRegionMax"] = {} defs["igGetContentRegionMax"][1] = {} defs["igGetContentRegionMax"][1]["args"] = "()" @@ -7819,24 +7654,8 @@ defs["igGetContentRegionMax"][2]["ov_cimguiname"] = "igGetContentRegionMax_nonUD defs["igGetContentRegionMax"][2]["ret"] = "void" defs["igGetContentRegionMax"][2]["signature"] = "()" defs["igGetContentRegionMax"][2]["stname"] = "" -defs["igGetContentRegionMax"][3] = {} -defs["igGetContentRegionMax"][3]["args"] = "()" -defs["igGetContentRegionMax"][3]["argsT"] = {} -defs["igGetContentRegionMax"][3]["argsoriginal"] = "()" -defs["igGetContentRegionMax"][3]["call_args"] = "()" -defs["igGetContentRegionMax"][3]["cimguiname"] = "igGetContentRegionMax" -defs["igGetContentRegionMax"][3]["defaults"] = defs["igGetContentRegionMax"][1]["defaults"] -defs["igGetContentRegionMax"][3]["funcname"] = "GetContentRegionMax" -defs["igGetContentRegionMax"][3]["namespace"] = "ImGui" -defs["igGetContentRegionMax"][3]["nonUDT"] = 2 -defs["igGetContentRegionMax"][3]["ov_cimguiname"] = "igGetContentRegionMax_nonUDT2" -defs["igGetContentRegionMax"][3]["ret"] = "ImVec2_Simple" -defs["igGetContentRegionMax"][3]["retorig"] = "ImVec2" -defs["igGetContentRegionMax"][3]["signature"] = "()" -defs["igGetContentRegionMax"][3]["stname"] = "" defs["igGetContentRegionMax"]["()"] = defs["igGetContentRegionMax"][1] defs["igGetContentRegionMax"]["()nonUDT"] = defs["igGetContentRegionMax"][2] -defs["igGetContentRegionMax"]["()nonUDT2"] = defs["igGetContentRegionMax"][3] defs["igGetCurrentContext"] = {} defs["igGetCurrentContext"][1] = {} defs["igGetCurrentContext"][1]["args"] = "()" @@ -7883,24 +7702,8 @@ defs["igGetCursorPos"][2]["ov_cimguiname"] = "igGetCursorPos_nonUDT" defs["igGetCursorPos"][2]["ret"] = "void" defs["igGetCursorPos"][2]["signature"] = "()" defs["igGetCursorPos"][2]["stname"] = "" -defs["igGetCursorPos"][3] = {} -defs["igGetCursorPos"][3]["args"] = "()" -defs["igGetCursorPos"][3]["argsT"] = {} -defs["igGetCursorPos"][3]["argsoriginal"] = "()" -defs["igGetCursorPos"][3]["call_args"] = "()" -defs["igGetCursorPos"][3]["cimguiname"] = "igGetCursorPos" -defs["igGetCursorPos"][3]["defaults"] = defs["igGetCursorPos"][1]["defaults"] -defs["igGetCursorPos"][3]["funcname"] = "GetCursorPos" -defs["igGetCursorPos"][3]["namespace"] = "ImGui" -defs["igGetCursorPos"][3]["nonUDT"] = 2 -defs["igGetCursorPos"][3]["ov_cimguiname"] = "igGetCursorPos_nonUDT2" -defs["igGetCursorPos"][3]["ret"] = "ImVec2_Simple" -defs["igGetCursorPos"][3]["retorig"] = "ImVec2" -defs["igGetCursorPos"][3]["signature"] = "()" -defs["igGetCursorPos"][3]["stname"] = "" defs["igGetCursorPos"]["()"] = defs["igGetCursorPos"][1] defs["igGetCursorPos"]["()nonUDT"] = defs["igGetCursorPos"][2] -defs["igGetCursorPos"]["()nonUDT2"] = defs["igGetCursorPos"][3] defs["igGetCursorPosX"] = {} defs["igGetCursorPosX"][1] = {} defs["igGetCursorPosX"][1]["args"] = "()" @@ -7962,24 +7765,8 @@ defs["igGetCursorScreenPos"][2]["ov_cimguiname"] = "igGetCursorScreenPos_nonUDT" defs["igGetCursorScreenPos"][2]["ret"] = "void" defs["igGetCursorScreenPos"][2]["signature"] = "()" defs["igGetCursorScreenPos"][2]["stname"] = "" -defs["igGetCursorScreenPos"][3] = {} -defs["igGetCursorScreenPos"][3]["args"] = "()" -defs["igGetCursorScreenPos"][3]["argsT"] = {} -defs["igGetCursorScreenPos"][3]["argsoriginal"] = "()" -defs["igGetCursorScreenPos"][3]["call_args"] = "()" -defs["igGetCursorScreenPos"][3]["cimguiname"] = "igGetCursorScreenPos" -defs["igGetCursorScreenPos"][3]["defaults"] = defs["igGetCursorScreenPos"][1]["defaults"] -defs["igGetCursorScreenPos"][3]["funcname"] = "GetCursorScreenPos" -defs["igGetCursorScreenPos"][3]["namespace"] = "ImGui" -defs["igGetCursorScreenPos"][3]["nonUDT"] = 2 -defs["igGetCursorScreenPos"][3]["ov_cimguiname"] = "igGetCursorScreenPos_nonUDT2" -defs["igGetCursorScreenPos"][3]["ret"] = "ImVec2_Simple" -defs["igGetCursorScreenPos"][3]["retorig"] = "ImVec2" -defs["igGetCursorScreenPos"][3]["signature"] = "()" -defs["igGetCursorScreenPos"][3]["stname"] = "" defs["igGetCursorScreenPos"]["()"] = defs["igGetCursorScreenPos"][1] defs["igGetCursorScreenPos"]["()nonUDT"] = defs["igGetCursorScreenPos"][2] -defs["igGetCursorScreenPos"]["()nonUDT2"] = defs["igGetCursorScreenPos"][3] defs["igGetCursorStartPos"] = {} defs["igGetCursorStartPos"][1] = {} defs["igGetCursorStartPos"][1]["args"] = "()" @@ -8011,24 +7798,8 @@ defs["igGetCursorStartPos"][2]["ov_cimguiname"] = "igGetCursorStartPos_nonUDT" defs["igGetCursorStartPos"][2]["ret"] = "void" defs["igGetCursorStartPos"][2]["signature"] = "()" defs["igGetCursorStartPos"][2]["stname"] = "" -defs["igGetCursorStartPos"][3] = {} -defs["igGetCursorStartPos"][3]["args"] = "()" -defs["igGetCursorStartPos"][3]["argsT"] = {} -defs["igGetCursorStartPos"][3]["argsoriginal"] = "()" -defs["igGetCursorStartPos"][3]["call_args"] = "()" -defs["igGetCursorStartPos"][3]["cimguiname"] = "igGetCursorStartPos" -defs["igGetCursorStartPos"][3]["defaults"] = defs["igGetCursorStartPos"][1]["defaults"] -defs["igGetCursorStartPos"][3]["funcname"] = "GetCursorStartPos" -defs["igGetCursorStartPos"][3]["namespace"] = "ImGui" -defs["igGetCursorStartPos"][3]["nonUDT"] = 2 -defs["igGetCursorStartPos"][3]["ov_cimguiname"] = "igGetCursorStartPos_nonUDT2" -defs["igGetCursorStartPos"][3]["ret"] = "ImVec2_Simple" -defs["igGetCursorStartPos"][3]["retorig"] = "ImVec2" -defs["igGetCursorStartPos"][3]["signature"] = "()" -defs["igGetCursorStartPos"][3]["stname"] = "" defs["igGetCursorStartPos"]["()"] = defs["igGetCursorStartPos"][1] defs["igGetCursorStartPos"]["()nonUDT"] = defs["igGetCursorStartPos"][2] -defs["igGetCursorStartPos"]["()nonUDT2"] = defs["igGetCursorStartPos"][3] defs["igGetDragDropPayload"] = {} defs["igGetDragDropPayload"][1] = {} defs["igGetDragDropPayload"][1]["args"] = "()" @@ -8135,24 +7906,8 @@ defs["igGetFontTexUvWhitePixel"][2]["ov_cimguiname"] = "igGetFontTexUvWhitePixel defs["igGetFontTexUvWhitePixel"][2]["ret"] = "void" defs["igGetFontTexUvWhitePixel"][2]["signature"] = "()" defs["igGetFontTexUvWhitePixel"][2]["stname"] = "" -defs["igGetFontTexUvWhitePixel"][3] = {} -defs["igGetFontTexUvWhitePixel"][3]["args"] = "()" -defs["igGetFontTexUvWhitePixel"][3]["argsT"] = {} -defs["igGetFontTexUvWhitePixel"][3]["argsoriginal"] = "()" -defs["igGetFontTexUvWhitePixel"][3]["call_args"] = "()" -defs["igGetFontTexUvWhitePixel"][3]["cimguiname"] = "igGetFontTexUvWhitePixel" -defs["igGetFontTexUvWhitePixel"][3]["defaults"] = defs["igGetFontTexUvWhitePixel"][1]["defaults"] -defs["igGetFontTexUvWhitePixel"][3]["funcname"] = "GetFontTexUvWhitePixel" -defs["igGetFontTexUvWhitePixel"][3]["namespace"] = "ImGui" -defs["igGetFontTexUvWhitePixel"][3]["nonUDT"] = 2 -defs["igGetFontTexUvWhitePixel"][3]["ov_cimguiname"] = "igGetFontTexUvWhitePixel_nonUDT2" -defs["igGetFontTexUvWhitePixel"][3]["ret"] = "ImVec2_Simple" -defs["igGetFontTexUvWhitePixel"][3]["retorig"] = "ImVec2" -defs["igGetFontTexUvWhitePixel"][3]["signature"] = "()" -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"] = "()" @@ -8245,7 +8000,7 @@ defs["igGetID"][2]["cimguiname"] = "igGetID" defs["igGetID"][2]["defaults"] = {} defs["igGetID"][2]["funcname"] = "GetID" defs["igGetID"][2]["namespace"] = "ImGui" -defs["igGetID"][2]["ov_cimguiname"] = "igGetIDRange" +defs["igGetID"][2]["ov_cimguiname"] = "igGetIDStrStr" defs["igGetID"][2]["ret"] = "ImGuiID" defs["igGetID"][2]["signature"] = "(const char*,const char*)" defs["igGetID"][2]["stname"] = "" @@ -8315,24 +8070,8 @@ defs["igGetItemRectMax"][2]["ov_cimguiname"] = "igGetItemRectMax_nonUDT" defs["igGetItemRectMax"][2]["ret"] = "void" defs["igGetItemRectMax"][2]["signature"] = "()" defs["igGetItemRectMax"][2]["stname"] = "" -defs["igGetItemRectMax"][3] = {} -defs["igGetItemRectMax"][3]["args"] = "()" -defs["igGetItemRectMax"][3]["argsT"] = {} -defs["igGetItemRectMax"][3]["argsoriginal"] = "()" -defs["igGetItemRectMax"][3]["call_args"] = "()" -defs["igGetItemRectMax"][3]["cimguiname"] = "igGetItemRectMax" -defs["igGetItemRectMax"][3]["defaults"] = defs["igGetItemRectMax"][1]["defaults"] -defs["igGetItemRectMax"][3]["funcname"] = "GetItemRectMax" -defs["igGetItemRectMax"][3]["namespace"] = "ImGui" -defs["igGetItemRectMax"][3]["nonUDT"] = 2 -defs["igGetItemRectMax"][3]["ov_cimguiname"] = "igGetItemRectMax_nonUDT2" -defs["igGetItemRectMax"][3]["ret"] = "ImVec2_Simple" -defs["igGetItemRectMax"][3]["retorig"] = "ImVec2" -defs["igGetItemRectMax"][3]["signature"] = "()" -defs["igGetItemRectMax"][3]["stname"] = "" defs["igGetItemRectMax"]["()"] = defs["igGetItemRectMax"][1] defs["igGetItemRectMax"]["()nonUDT"] = defs["igGetItemRectMax"][2] -defs["igGetItemRectMax"]["()nonUDT2"] = defs["igGetItemRectMax"][3] defs["igGetItemRectMin"] = {} defs["igGetItemRectMin"][1] = {} defs["igGetItemRectMin"][1]["args"] = "()" @@ -8364,24 +8103,8 @@ defs["igGetItemRectMin"][2]["ov_cimguiname"] = "igGetItemRectMin_nonUDT" defs["igGetItemRectMin"][2]["ret"] = "void" defs["igGetItemRectMin"][2]["signature"] = "()" defs["igGetItemRectMin"][2]["stname"] = "" -defs["igGetItemRectMin"][3] = {} -defs["igGetItemRectMin"][3]["args"] = "()" -defs["igGetItemRectMin"][3]["argsT"] = {} -defs["igGetItemRectMin"][3]["argsoriginal"] = "()" -defs["igGetItemRectMin"][3]["call_args"] = "()" -defs["igGetItemRectMin"][3]["cimguiname"] = "igGetItemRectMin" -defs["igGetItemRectMin"][3]["defaults"] = defs["igGetItemRectMin"][1]["defaults"] -defs["igGetItemRectMin"][3]["funcname"] = "GetItemRectMin" -defs["igGetItemRectMin"][3]["namespace"] = "ImGui" -defs["igGetItemRectMin"][3]["nonUDT"] = 2 -defs["igGetItemRectMin"][3]["ov_cimguiname"] = "igGetItemRectMin_nonUDT2" -defs["igGetItemRectMin"][3]["ret"] = "ImVec2_Simple" -defs["igGetItemRectMin"][3]["retorig"] = "ImVec2" -defs["igGetItemRectMin"][3]["signature"] = "()" -defs["igGetItemRectMin"][3]["stname"] = "" defs["igGetItemRectMin"]["()"] = defs["igGetItemRectMin"][1] defs["igGetItemRectMin"]["()nonUDT"] = defs["igGetItemRectMin"][2] -defs["igGetItemRectMin"]["()nonUDT2"] = defs["igGetItemRectMin"][3] defs["igGetItemRectSize"] = {} defs["igGetItemRectSize"][1] = {} defs["igGetItemRectSize"][1]["args"] = "()" @@ -8413,24 +8136,8 @@ defs["igGetItemRectSize"][2]["ov_cimguiname"] = "igGetItemRectSize_nonUDT" defs["igGetItemRectSize"][2]["ret"] = "void" defs["igGetItemRectSize"][2]["signature"] = "()" defs["igGetItemRectSize"][2]["stname"] = "" -defs["igGetItemRectSize"][3] = {} -defs["igGetItemRectSize"][3]["args"] = "()" -defs["igGetItemRectSize"][3]["argsT"] = {} -defs["igGetItemRectSize"][3]["argsoriginal"] = "()" -defs["igGetItemRectSize"][3]["call_args"] = "()" -defs["igGetItemRectSize"][3]["cimguiname"] = "igGetItemRectSize" -defs["igGetItemRectSize"][3]["defaults"] = defs["igGetItemRectSize"][1]["defaults"] -defs["igGetItemRectSize"][3]["funcname"] = "GetItemRectSize" -defs["igGetItemRectSize"][3]["namespace"] = "ImGui" -defs["igGetItemRectSize"][3]["nonUDT"] = 2 -defs["igGetItemRectSize"][3]["ov_cimguiname"] = "igGetItemRectSize_nonUDT2" -defs["igGetItemRectSize"][3]["ret"] = "ImVec2_Simple" -defs["igGetItemRectSize"][3]["retorig"] = "ImVec2" -defs["igGetItemRectSize"][3]["signature"] = "()" -defs["igGetItemRectSize"][3]["stname"] = "" defs["igGetItemRectSize"]["()"] = defs["igGetItemRectSize"][1] defs["igGetItemRectSize"]["()nonUDT"] = defs["igGetItemRectSize"][2] -defs["igGetItemRectSize"]["()nonUDT2"] = defs["igGetItemRectSize"][3] defs["igGetKeyIndex"] = {} defs["igGetKeyIndex"][1] = {} defs["igGetKeyIndex"][1]["args"] = "(ImGuiKey imgui_key)" @@ -8533,30 +8240,8 @@ defs["igGetMouseDragDelta"][2]["ov_cimguiname"] = "igGetMouseDragDelta_nonUDT" defs["igGetMouseDragDelta"][2]["ret"] = "void" defs["igGetMouseDragDelta"][2]["signature"] = "(ImGuiMouseButton,float)" defs["igGetMouseDragDelta"][2]["stname"] = "" -defs["igGetMouseDragDelta"][3] = {} -defs["igGetMouseDragDelta"][3]["args"] = "(ImGuiMouseButton button,float lock_threshold)" -defs["igGetMouseDragDelta"][3]["argsT"] = {} -defs["igGetMouseDragDelta"][3]["argsT"][1] = {} -defs["igGetMouseDragDelta"][3]["argsT"][1]["name"] = "button" -defs["igGetMouseDragDelta"][3]["argsT"][1]["type"] = "ImGuiMouseButton" -defs["igGetMouseDragDelta"][3]["argsT"][2] = {} -defs["igGetMouseDragDelta"][3]["argsT"][2]["name"] = "lock_threshold" -defs["igGetMouseDragDelta"][3]["argsT"][2]["type"] = "float" -defs["igGetMouseDragDelta"][3]["argsoriginal"] = "(ImGuiMouseButton button=0,float lock_threshold=-1.0f)" -defs["igGetMouseDragDelta"][3]["call_args"] = "(button,lock_threshold)" -defs["igGetMouseDragDelta"][3]["cimguiname"] = "igGetMouseDragDelta" -defs["igGetMouseDragDelta"][3]["defaults"] = defs["igGetMouseDragDelta"][1]["defaults"] -defs["igGetMouseDragDelta"][3]["funcname"] = "GetMouseDragDelta" -defs["igGetMouseDragDelta"][3]["namespace"] = "ImGui" -defs["igGetMouseDragDelta"][3]["nonUDT"] = 2 -defs["igGetMouseDragDelta"][3]["ov_cimguiname"] = "igGetMouseDragDelta_nonUDT2" -defs["igGetMouseDragDelta"][3]["ret"] = "ImVec2_Simple" -defs["igGetMouseDragDelta"][3]["retorig"] = "ImVec2" -defs["igGetMouseDragDelta"][3]["signature"] = "(ImGuiMouseButton,float)" -defs["igGetMouseDragDelta"][3]["stname"] = "" defs["igGetMouseDragDelta"]["(ImGuiMouseButton,float)"] = defs["igGetMouseDragDelta"][1] defs["igGetMouseDragDelta"]["(ImGuiMouseButton,float)nonUDT"] = defs["igGetMouseDragDelta"][2] -defs["igGetMouseDragDelta"]["(ImGuiMouseButton,float)nonUDT2"] = defs["igGetMouseDragDelta"][3] defs["igGetMousePos"] = {} defs["igGetMousePos"][1] = {} defs["igGetMousePos"][1]["args"] = "()" @@ -8588,24 +8273,8 @@ defs["igGetMousePos"][2]["ov_cimguiname"] = "igGetMousePos_nonUDT" defs["igGetMousePos"][2]["ret"] = "void" defs["igGetMousePos"][2]["signature"] = "()" defs["igGetMousePos"][2]["stname"] = "" -defs["igGetMousePos"][3] = {} -defs["igGetMousePos"][3]["args"] = "()" -defs["igGetMousePos"][3]["argsT"] = {} -defs["igGetMousePos"][3]["argsoriginal"] = "()" -defs["igGetMousePos"][3]["call_args"] = "()" -defs["igGetMousePos"][3]["cimguiname"] = "igGetMousePos" -defs["igGetMousePos"][3]["defaults"] = defs["igGetMousePos"][1]["defaults"] -defs["igGetMousePos"][3]["funcname"] = "GetMousePos" -defs["igGetMousePos"][3]["namespace"] = "ImGui" -defs["igGetMousePos"][3]["nonUDT"] = 2 -defs["igGetMousePos"][3]["ov_cimguiname"] = "igGetMousePos_nonUDT2" -defs["igGetMousePos"][3]["ret"] = "ImVec2_Simple" -defs["igGetMousePos"][3]["retorig"] = "ImVec2" -defs["igGetMousePos"][3]["signature"] = "()" -defs["igGetMousePos"][3]["stname"] = "" defs["igGetMousePos"]["()"] = defs["igGetMousePos"][1] defs["igGetMousePos"]["()nonUDT"] = defs["igGetMousePos"][2] -defs["igGetMousePos"]["()nonUDT2"] = defs["igGetMousePos"][3] defs["igGetMousePosOnOpeningCurrentPopup"] = {} defs["igGetMousePosOnOpeningCurrentPopup"][1] = {} defs["igGetMousePosOnOpeningCurrentPopup"][1]["args"] = "()" @@ -8637,24 +8306,8 @@ defs["igGetMousePosOnOpeningCurrentPopup"][2]["ov_cimguiname"] = "igGetMousePosO defs["igGetMousePosOnOpeningCurrentPopup"][2]["ret"] = "void" defs["igGetMousePosOnOpeningCurrentPopup"][2]["signature"] = "()" defs["igGetMousePosOnOpeningCurrentPopup"][2]["stname"] = "" -defs["igGetMousePosOnOpeningCurrentPopup"][3] = {} -defs["igGetMousePosOnOpeningCurrentPopup"][3]["args"] = "()" -defs["igGetMousePosOnOpeningCurrentPopup"][3]["argsT"] = {} -defs["igGetMousePosOnOpeningCurrentPopup"][3]["argsoriginal"] = "()" -defs["igGetMousePosOnOpeningCurrentPopup"][3]["call_args"] = "()" -defs["igGetMousePosOnOpeningCurrentPopup"][3]["cimguiname"] = "igGetMousePosOnOpeningCurrentPopup" -defs["igGetMousePosOnOpeningCurrentPopup"][3]["defaults"] = defs["igGetMousePosOnOpeningCurrentPopup"][1]["defaults"] -defs["igGetMousePosOnOpeningCurrentPopup"][3]["funcname"] = "GetMousePosOnOpeningCurrentPopup" -defs["igGetMousePosOnOpeningCurrentPopup"][3]["namespace"] = "ImGui" -defs["igGetMousePosOnOpeningCurrentPopup"][3]["nonUDT"] = 2 -defs["igGetMousePosOnOpeningCurrentPopup"][3]["ov_cimguiname"] = "igGetMousePosOnOpeningCurrentPopup_nonUDT2" -defs["igGetMousePosOnOpeningCurrentPopup"][3]["ret"] = "ImVec2_Simple" -defs["igGetMousePosOnOpeningCurrentPopup"][3]["retorig"] = "ImVec2" -defs["igGetMousePosOnOpeningCurrentPopup"][3]["signature"] = "()" -defs["igGetMousePosOnOpeningCurrentPopup"][3]["stname"] = "" defs["igGetMousePosOnOpeningCurrentPopup"]["()"] = defs["igGetMousePosOnOpeningCurrentPopup"][1] defs["igGetMousePosOnOpeningCurrentPopup"]["()nonUDT"] = defs["igGetMousePosOnOpeningCurrentPopup"][2] -defs["igGetMousePosOnOpeningCurrentPopup"]["()nonUDT2"] = defs["igGetMousePosOnOpeningCurrentPopup"][3] defs["igGetScrollMaxX"] = {} defs["igGetScrollMaxX"][1] = {} defs["igGetScrollMaxX"][1]["args"] = "()" @@ -8889,24 +8542,8 @@ defs["igGetWindowContentRegionMax"][2]["ov_cimguiname"] = "igGetWindowContentReg defs["igGetWindowContentRegionMax"][2]["ret"] = "void" defs["igGetWindowContentRegionMax"][2]["signature"] = "()" defs["igGetWindowContentRegionMax"][2]["stname"] = "" -defs["igGetWindowContentRegionMax"][3] = {} -defs["igGetWindowContentRegionMax"][3]["args"] = "()" -defs["igGetWindowContentRegionMax"][3]["argsT"] = {} -defs["igGetWindowContentRegionMax"][3]["argsoriginal"] = "()" -defs["igGetWindowContentRegionMax"][3]["call_args"] = "()" -defs["igGetWindowContentRegionMax"][3]["cimguiname"] = "igGetWindowContentRegionMax" -defs["igGetWindowContentRegionMax"][3]["defaults"] = defs["igGetWindowContentRegionMax"][1]["defaults"] -defs["igGetWindowContentRegionMax"][3]["funcname"] = "GetWindowContentRegionMax" -defs["igGetWindowContentRegionMax"][3]["namespace"] = "ImGui" -defs["igGetWindowContentRegionMax"][3]["nonUDT"] = 2 -defs["igGetWindowContentRegionMax"][3]["ov_cimguiname"] = "igGetWindowContentRegionMax_nonUDT2" -defs["igGetWindowContentRegionMax"][3]["ret"] = "ImVec2_Simple" -defs["igGetWindowContentRegionMax"][3]["retorig"] = "ImVec2" -defs["igGetWindowContentRegionMax"][3]["signature"] = "()" -defs["igGetWindowContentRegionMax"][3]["stname"] = "" defs["igGetWindowContentRegionMax"]["()"] = defs["igGetWindowContentRegionMax"][1] defs["igGetWindowContentRegionMax"]["()nonUDT"] = defs["igGetWindowContentRegionMax"][2] -defs["igGetWindowContentRegionMax"]["()nonUDT2"] = defs["igGetWindowContentRegionMax"][3] defs["igGetWindowContentRegionMin"] = {} defs["igGetWindowContentRegionMin"][1] = {} defs["igGetWindowContentRegionMin"][1]["args"] = "()" @@ -8938,24 +8575,8 @@ defs["igGetWindowContentRegionMin"][2]["ov_cimguiname"] = "igGetWindowContentReg defs["igGetWindowContentRegionMin"][2]["ret"] = "void" defs["igGetWindowContentRegionMin"][2]["signature"] = "()" defs["igGetWindowContentRegionMin"][2]["stname"] = "" -defs["igGetWindowContentRegionMin"][3] = {} -defs["igGetWindowContentRegionMin"][3]["args"] = "()" -defs["igGetWindowContentRegionMin"][3]["argsT"] = {} -defs["igGetWindowContentRegionMin"][3]["argsoriginal"] = "()" -defs["igGetWindowContentRegionMin"][3]["call_args"] = "()" -defs["igGetWindowContentRegionMin"][3]["cimguiname"] = "igGetWindowContentRegionMin" -defs["igGetWindowContentRegionMin"][3]["defaults"] = defs["igGetWindowContentRegionMin"][1]["defaults"] -defs["igGetWindowContentRegionMin"][3]["funcname"] = "GetWindowContentRegionMin" -defs["igGetWindowContentRegionMin"][3]["namespace"] = "ImGui" -defs["igGetWindowContentRegionMin"][3]["nonUDT"] = 2 -defs["igGetWindowContentRegionMin"][3]["ov_cimguiname"] = "igGetWindowContentRegionMin_nonUDT2" -defs["igGetWindowContentRegionMin"][3]["ret"] = "ImVec2_Simple" -defs["igGetWindowContentRegionMin"][3]["retorig"] = "ImVec2" -defs["igGetWindowContentRegionMin"][3]["signature"] = "()" -defs["igGetWindowContentRegionMin"][3]["stname"] = "" defs["igGetWindowContentRegionMin"]["()"] = defs["igGetWindowContentRegionMin"][1] defs["igGetWindowContentRegionMin"]["()nonUDT"] = defs["igGetWindowContentRegionMin"][2] -defs["igGetWindowContentRegionMin"]["()nonUDT2"] = defs["igGetWindowContentRegionMin"][3] defs["igGetWindowContentRegionWidth"] = {} defs["igGetWindowContentRegionWidth"][1] = {} defs["igGetWindowContentRegionWidth"][1]["args"] = "()" @@ -9032,24 +8653,8 @@ defs["igGetWindowPos"][2]["ov_cimguiname"] = "igGetWindowPos_nonUDT" defs["igGetWindowPos"][2]["ret"] = "void" defs["igGetWindowPos"][2]["signature"] = "()" defs["igGetWindowPos"][2]["stname"] = "" -defs["igGetWindowPos"][3] = {} -defs["igGetWindowPos"][3]["args"] = "()" -defs["igGetWindowPos"][3]["argsT"] = {} -defs["igGetWindowPos"][3]["argsoriginal"] = "()" -defs["igGetWindowPos"][3]["call_args"] = "()" -defs["igGetWindowPos"][3]["cimguiname"] = "igGetWindowPos" -defs["igGetWindowPos"][3]["defaults"] = defs["igGetWindowPos"][1]["defaults"] -defs["igGetWindowPos"][3]["funcname"] = "GetWindowPos" -defs["igGetWindowPos"][3]["namespace"] = "ImGui" -defs["igGetWindowPos"][3]["nonUDT"] = 2 -defs["igGetWindowPos"][3]["ov_cimguiname"] = "igGetWindowPos_nonUDT2" -defs["igGetWindowPos"][3]["ret"] = "ImVec2_Simple" -defs["igGetWindowPos"][3]["retorig"] = "ImVec2" -defs["igGetWindowPos"][3]["signature"] = "()" -defs["igGetWindowPos"][3]["stname"] = "" defs["igGetWindowPos"]["()"] = defs["igGetWindowPos"][1] defs["igGetWindowPos"]["()nonUDT"] = defs["igGetWindowPos"][2] -defs["igGetWindowPos"]["()nonUDT2"] = defs["igGetWindowPos"][3] defs["igGetWindowSize"] = {} defs["igGetWindowSize"][1] = {} defs["igGetWindowSize"][1]["args"] = "()" @@ -9081,24 +8686,8 @@ defs["igGetWindowSize"][2]["ov_cimguiname"] = "igGetWindowSize_nonUDT" defs["igGetWindowSize"][2]["ret"] = "void" defs["igGetWindowSize"][2]["signature"] = "()" defs["igGetWindowSize"][2]["stname"] = "" -defs["igGetWindowSize"][3] = {} -defs["igGetWindowSize"][3]["args"] = "()" -defs["igGetWindowSize"][3]["argsT"] = {} -defs["igGetWindowSize"][3]["argsoriginal"] = "()" -defs["igGetWindowSize"][3]["call_args"] = "()" -defs["igGetWindowSize"][3]["cimguiname"] = "igGetWindowSize" -defs["igGetWindowSize"][3]["defaults"] = defs["igGetWindowSize"][1]["defaults"] -defs["igGetWindowSize"][3]["funcname"] = "GetWindowSize" -defs["igGetWindowSize"][3]["namespace"] = "ImGui" -defs["igGetWindowSize"][3]["nonUDT"] = 2 -defs["igGetWindowSize"][3]["ov_cimguiname"] = "igGetWindowSize_nonUDT2" -defs["igGetWindowSize"][3]["ret"] = "ImVec2_Simple" -defs["igGetWindowSize"][3]["retorig"] = "ImVec2" -defs["igGetWindowSize"][3]["signature"] = "()" -defs["igGetWindowSize"][3]["stname"] = "" defs["igGetWindowSize"]["()"] = defs["igGetWindowSize"][1] defs["igGetWindowSize"]["()nonUDT"] = defs["igGetWindowSize"][2] -defs["igGetWindowSize"]["()nonUDT2"] = defs["igGetWindowSize"][3] defs["igGetWindowWidth"] = {} defs["igGetWindowWidth"][1] = {} defs["igGetWindowWidth"][1]["args"] = "()" @@ -10889,7 +10478,7 @@ defs["igPlotLines"][1]["defaults"]["stride"] = "sizeof(float)" defs["igPlotLines"][1]["defaults"]["values_offset"] = "0" defs["igPlotLines"][1]["funcname"] = "PlotLines" defs["igPlotLines"][1]["namespace"] = "ImGui" -defs["igPlotLines"][1]["ov_cimguiname"] = "igPlotLines" +defs["igPlotLines"][1]["ov_cimguiname"] = "igPlotLinesFloatPtr" defs["igPlotLines"][1]["ret"] = "void" defs["igPlotLines"][1]["signature"] = "(const char*,const float*,int,int,const char*,float,float,ImVec2,int)" defs["igPlotLines"][1]["stname"] = "" @@ -11221,7 +10810,7 @@ defs["igPushID"][2]["cimguiname"] = "igPushID" defs["igPushID"][2]["defaults"] = {} defs["igPushID"][2]["funcname"] = "PushID" defs["igPushID"][2]["namespace"] = "ImGui" -defs["igPushID"][2]["ov_cimguiname"] = "igPushIDRange" +defs["igPushID"][2]["ov_cimguiname"] = "igPushIDStrStr" defs["igPushID"][2]["ret"] = "void" defs["igPushID"][2]["signature"] = "(const char*,const char*)" defs["igPushID"][2]["stname"] = "" @@ -11314,7 +10903,7 @@ defs["igPushStyleColor"][2]["cimguiname"] = "igPushStyleColor" defs["igPushStyleColor"][2]["defaults"] = {} defs["igPushStyleColor"][2]["funcname"] = "PushStyleColor" defs["igPushStyleColor"][2]["namespace"] = "ImGui" -defs["igPushStyleColor"][2]["ov_cimguiname"] = "igPushStyleColor" +defs["igPushStyleColor"][2]["ov_cimguiname"] = "igPushStyleColorVec4" defs["igPushStyleColor"][2]["ret"] = "void" defs["igPushStyleColor"][2]["signature"] = "(ImGuiCol,const ImVec4)" defs["igPushStyleColor"][2]["stname"] = "" @@ -11543,7 +11132,7 @@ defs["igSelectable"][1]["defaults"]["selected"] = "false" defs["igSelectable"][1]["defaults"]["size"] = "ImVec2(0,0)" defs["igSelectable"][1]["funcname"] = "Selectable" defs["igSelectable"][1]["namespace"] = "ImGui" -defs["igSelectable"][1]["ov_cimguiname"] = "igSelectable" +defs["igSelectable"][1]["ov_cimguiname"] = "igSelectableBool" defs["igSelectable"][1]["ret"] = "bool" defs["igSelectable"][1]["signature"] = "(const char*,bool,ImGuiSelectableFlags,const ImVec2)" defs["igSelectable"][1]["stname"] = "" diff --git a/generator/output/overloads.txt b/generator/output/overloads.txt index a0b96b0..12620dc 100644 --- a/generator/output/overloads.txt +++ b/generator/output/overloads.txt @@ -27,17 +27,17 @@ igPlotHistogram 2 2 void igPlotHistogramFnPtr (const char*,float(*)(void*,int),void*,int,int,const char*,float,float,ImVec2) igGetID 3 1 ImGuiID igGetIDStr (const char*) -2 ImGuiID igGetIDRange (const char*,const char*) +2 ImGuiID igGetIDStrStr (const char*,const char*) 3 ImGuiID igGetIDPtr (const void*) 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) +1 bool igBeginChildStr (const char*,const ImVec2,bool,ImGuiWindowFlags) 2 bool igBeginChildID (ImGuiID,const ImVec2,bool,ImGuiWindowFlags) igPushID 4 1 void igPushIDStr (const char*) -2 void igPushIDRange (const char*,const char*) +2 void igPushIDStrStr (const char*,const char*) 3 void igPushIDPtr (const void*) 4 void igPushIDInt (int) ImGuiStoragePair_ImGuiStoragePair 3 @@ -49,14 +49,14 @@ igTreeNode 3 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) +1 bool igComboStr_arr (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*) ImDrawList_AddText 2 -1 void ImDrawList_AddText (const ImVec2,ImU32,const char*,const char*) +1 void ImDrawList_AddTextVec2 (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) @@ -77,11 +77,11 @@ 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) +1 void igPlotLinesFloatPtr (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) igPushStyleColor 2 1 void igPushStyleColorU32 (ImGuiCol,ImU32) -2 void igPushStyleColor (ImGuiCol,const ImVec4) +2 void igPushStyleColorVec4 (ImGuiCol,const ImVec4) igTreeNodeExV 2 1 bool igTreeNodeExVStr (const char*,ImGuiTreeNodeFlags,const char*,va_list) 2 bool igTreeNodeExVPtr (const void*,ImGuiTreeNodeFlags,const char*,va_list) @@ -92,13 +92,13 @@ ImVec2_ImVec2 2 1 nil ImVec2_ImVec2 () 2 nil ImVec2_ImVec2Float (float,float) igCollapsingHeader 2 -1 bool igCollapsingHeader (const char*,ImGuiTreeNodeFlags) +1 bool igCollapsingHeaderTreeNodeFlags (const char*,ImGuiTreeNodeFlags) 2 bool igCollapsingHeaderBoolPtr (const char*,bool*,ImGuiTreeNodeFlags) igTreePush 2 1 void igTreePushStr (const char*) 2 void igTreePushPtr (const void*) igGetColorU32 3 -1 ImU32 igGetColorU32 (ImGuiCol,float) +1 ImU32 igGetColorU32Col (ImGuiCol,float) 2 ImU32 igGetColorU32Vec4 (const ImVec4) 3 ImU32 igGetColorU32U32 (ImU32) ImColor_ImColor 5 @@ -108,7 +108,7 @@ ImColor_ImColor 5 4 nil ImColor_ImColorFloat (float,float,float,float) 5 nil ImColor_ImColorVec4 (const ImVec4) igSelectable 2 -1 bool igSelectable (const char*,bool,ImGuiSelectableFlags,const ImVec2) +1 bool igSelectableBool (const char*,bool,ImGuiSelectableFlags,const ImVec2) 2 bool igSelectableBoolPtr (const char*,bool*,ImGuiSelectableFlags,const ImVec2) ImVector_begin 2 1 T* ImVector_begin ()