diff --git a/cimgui.cpp b/cimgui.cpp index 92638af..6134794 100644 --- a/cimgui.cpp +++ b/cimgui.cpp @@ -7,7 +7,7 @@ -CIMGUI_API ImVec2* ImVec2_ImVec2(void) +CIMGUI_API ImVec2* ImVec2_ImVec2Nil(void) { return IM_NEW(ImVec2)(); } @@ -19,7 +19,7 @@ CIMGUI_API ImVec2* ImVec2_ImVec2Float(float _x,float _y) { return IM_NEW(ImVec2)(_x,_y); } -CIMGUI_API ImVec4* ImVec4_ImVec4(void) +CIMGUI_API ImVec4* ImVec4_ImVec4Nil(void) { return IM_NEW(ImVec4)(); } @@ -215,7 +215,7 @@ CIMGUI_API void igSetWindowCollapsedBool(bool collapsed,ImGuiCond cond) { return ImGui::SetWindowCollapsed(collapsed,cond); } -CIMGUI_API void igSetWindowFocus() +CIMGUI_API void igSetWindowFocusNil() { return ImGui::SetWindowFocus(); } @@ -1264,7 +1264,7 @@ CIMGUI_API void igSetItemAllowOverlap() { return ImGui::SetItemAllowOverlap(); } -CIMGUI_API bool igIsRectVisible(const ImVec2 size) +CIMGUI_API bool igIsRectVisibleNil(const ImVec2 size) { return ImGui::IsRectVisible(size); } @@ -1560,7 +1560,7 @@ CIMGUI_API bool ImGuiTextFilter_IsActive(ImGuiTextFilter* self) { return self->IsActive(); } -CIMGUI_API ImGuiTextRange* ImGuiTextRange_ImGuiTextRange(void) +CIMGUI_API ImGuiTextRange* ImGuiTextRange_ImGuiTextRangeNil(void) { return IM_NEW(ImGuiTextRange)(); } @@ -1720,7 +1720,7 @@ CIMGUI_API void ImGuiListClipper_End(ImGuiListClipper* self) { return self->End(); } -CIMGUI_API ImColor* ImColor_ImColor(void) +CIMGUI_API ImColor* ImColor_ImColorNil(void) { return IM_NEW(ImColor)(); } diff --git a/cimgui.h b/cimgui.h index 962f72d..f2645be 100644 --- a/cimgui.h +++ b/cimgui.h @@ -900,10 +900,10 @@ typedef ImVector ImVector_ImVec4; typedef ImVector ImVector_ImDrawIdx; typedef ImVector ImVector_ImVec2; #endif //CIMGUI_DEFINE_ENUMS_AND_STRUCTS -CIMGUI_API ImVec2* ImVec2_ImVec2(void); +CIMGUI_API ImVec2* ImVec2_ImVec2Nil(void); CIMGUI_API void ImVec2_destroy(ImVec2* self); CIMGUI_API ImVec2* ImVec2_ImVec2Float(float _x,float _y); -CIMGUI_API ImVec4* ImVec4_ImVec4(void); +CIMGUI_API ImVec4* ImVec4_ImVec4Nil(void); CIMGUI_API void ImVec4_destroy(ImVec4* self); CIMGUI_API ImVec4* ImVec4_ImVec4Float(float _x,float _y,float _z,float _w); CIMGUI_API ImGuiContext* igCreateContext(ImFontAtlas* shared_font_atlas); @@ -952,7 +952,7 @@ CIMGUI_API void igSetNextWindowBgAlpha(float alpha); CIMGUI_API void igSetWindowPosVec2(const ImVec2 pos,ImGuiCond cond); CIMGUI_API void igSetWindowSizeVec2(const ImVec2 size,ImGuiCond cond); CIMGUI_API void igSetWindowCollapsedBool(bool collapsed,ImGuiCond cond); -CIMGUI_API void igSetWindowFocus(void); +CIMGUI_API void igSetWindowFocusNil(void); CIMGUI_API void igSetWindowFontScale(float scale); CIMGUI_API void igSetWindowPosStr(const char* name,const ImVec2 pos,ImGuiCond cond); CIMGUI_API void igSetWindowSizeStr(const char* name,const ImVec2 size,ImGuiCond cond); @@ -1205,7 +1205,7 @@ CIMGUI_API void igGetItemRectMin(ImVec2 *pOut); CIMGUI_API void igGetItemRectMax(ImVec2 *pOut); CIMGUI_API void igGetItemRectSize(ImVec2 *pOut); CIMGUI_API void igSetItemAllowOverlap(void); -CIMGUI_API bool igIsRectVisible(const ImVec2 size); +CIMGUI_API bool igIsRectVisibleNil(const ImVec2 size); CIMGUI_API bool igIsRectVisibleVec2(const ImVec2 rect_min,const ImVec2 rect_max); CIMGUI_API double igGetTime(void); CIMGUI_API int igGetFrameCount(void); @@ -1279,7 +1279,7 @@ CIMGUI_API bool ImGuiTextFilter_PassFilter(ImGuiTextFilter* self,const char* tex CIMGUI_API void ImGuiTextFilter_Build(ImGuiTextFilter* self); CIMGUI_API void ImGuiTextFilter_Clear(ImGuiTextFilter* self); CIMGUI_API bool ImGuiTextFilter_IsActive(ImGuiTextFilter* self); -CIMGUI_API ImGuiTextRange* ImGuiTextRange_ImGuiTextRange(void); +CIMGUI_API ImGuiTextRange* ImGuiTextRange_ImGuiTextRangeNil(void); CIMGUI_API void ImGuiTextRange_destroy(ImGuiTextRange* self); CIMGUI_API ImGuiTextRange* ImGuiTextRange_ImGuiTextRangeStr(const char* _b,const char* _e); CIMGUI_API bool ImGuiTextRange_empty(ImGuiTextRange* self); @@ -1319,7 +1319,7 @@ CIMGUI_API void ImGuiListClipper_destroy(ImGuiListClipper* self); CIMGUI_API bool ImGuiListClipper_Step(ImGuiListClipper* self); CIMGUI_API void ImGuiListClipper_Begin(ImGuiListClipper* self,int items_count,float items_height); CIMGUI_API void ImGuiListClipper_End(ImGuiListClipper* self); -CIMGUI_API ImColor* ImColor_ImColor(void); +CIMGUI_API ImColor* ImColor_ImColorNil(void); CIMGUI_API void ImColor_destroy(ImColor* self); CIMGUI_API ImColor* ImColor_ImColorInt(int r,int g,int b,int a); CIMGUI_API ImColor* ImColor_ImColorU32(ImU32 rgba); diff --git a/generator/cpp2ffi.lua b/generator/cpp2ffi.lua index d33247e..246e0be 100644 --- a/generator/cpp2ffi.lua +++ b/generator/cpp2ffi.lua @@ -380,6 +380,8 @@ local function name_overloadsAlgo(v) end end end + --avoid empty postfix which will be reserved to generic + for i,v in ipairs(bb) do if v=="" then bb[i]="Nil" end end return aa,bb end local function typetoStr(typ) @@ -1166,7 +1168,7 @@ function M.Parser() --take overloaded name from manual table or algorythm t.ov_cimguiname = self.getCname_overload(t.stname,t.funcname,t.signature) or k..typetoStr(post[i]) table.insert(strt,string.format("%d\t%s\t%s %s",i,t.ret,t.ov_cimguiname,t.signature)) - --prtable(typesc[i]) + --M.prtable(typesc[i],post) end --check not two names are equal (produced by bad cimguiname_overload) for i=1,#v-1 do diff --git a/generator/output/cimgui.cpp b/generator/output/cimgui.cpp index 92638af..6134794 100644 --- a/generator/output/cimgui.cpp +++ b/generator/output/cimgui.cpp @@ -7,7 +7,7 @@ -CIMGUI_API ImVec2* ImVec2_ImVec2(void) +CIMGUI_API ImVec2* ImVec2_ImVec2Nil(void) { return IM_NEW(ImVec2)(); } @@ -19,7 +19,7 @@ CIMGUI_API ImVec2* ImVec2_ImVec2Float(float _x,float _y) { return IM_NEW(ImVec2)(_x,_y); } -CIMGUI_API ImVec4* ImVec4_ImVec4(void) +CIMGUI_API ImVec4* ImVec4_ImVec4Nil(void) { return IM_NEW(ImVec4)(); } @@ -215,7 +215,7 @@ CIMGUI_API void igSetWindowCollapsedBool(bool collapsed,ImGuiCond cond) { return ImGui::SetWindowCollapsed(collapsed,cond); } -CIMGUI_API void igSetWindowFocus() +CIMGUI_API void igSetWindowFocusNil() { return ImGui::SetWindowFocus(); } @@ -1264,7 +1264,7 @@ CIMGUI_API void igSetItemAllowOverlap() { return ImGui::SetItemAllowOverlap(); } -CIMGUI_API bool igIsRectVisible(const ImVec2 size) +CIMGUI_API bool igIsRectVisibleNil(const ImVec2 size) { return ImGui::IsRectVisible(size); } @@ -1560,7 +1560,7 @@ CIMGUI_API bool ImGuiTextFilter_IsActive(ImGuiTextFilter* self) { return self->IsActive(); } -CIMGUI_API ImGuiTextRange* ImGuiTextRange_ImGuiTextRange(void) +CIMGUI_API ImGuiTextRange* ImGuiTextRange_ImGuiTextRangeNil(void) { return IM_NEW(ImGuiTextRange)(); } @@ -1720,7 +1720,7 @@ CIMGUI_API void ImGuiListClipper_End(ImGuiListClipper* self) { return self->End(); } -CIMGUI_API ImColor* ImColor_ImColor(void) +CIMGUI_API ImColor* ImColor_ImColorNil(void) { return IM_NEW(ImColor)(); } diff --git a/generator/output/cimgui.h b/generator/output/cimgui.h index 962f72d..f2645be 100644 --- a/generator/output/cimgui.h +++ b/generator/output/cimgui.h @@ -900,10 +900,10 @@ typedef ImVector ImVector_ImVec4; typedef ImVector ImVector_ImDrawIdx; typedef ImVector ImVector_ImVec2; #endif //CIMGUI_DEFINE_ENUMS_AND_STRUCTS -CIMGUI_API ImVec2* ImVec2_ImVec2(void); +CIMGUI_API ImVec2* ImVec2_ImVec2Nil(void); CIMGUI_API void ImVec2_destroy(ImVec2* self); CIMGUI_API ImVec2* ImVec2_ImVec2Float(float _x,float _y); -CIMGUI_API ImVec4* ImVec4_ImVec4(void); +CIMGUI_API ImVec4* ImVec4_ImVec4Nil(void); CIMGUI_API void ImVec4_destroy(ImVec4* self); CIMGUI_API ImVec4* ImVec4_ImVec4Float(float _x,float _y,float _z,float _w); CIMGUI_API ImGuiContext* igCreateContext(ImFontAtlas* shared_font_atlas); @@ -952,7 +952,7 @@ CIMGUI_API void igSetNextWindowBgAlpha(float alpha); CIMGUI_API void igSetWindowPosVec2(const ImVec2 pos,ImGuiCond cond); CIMGUI_API void igSetWindowSizeVec2(const ImVec2 size,ImGuiCond cond); CIMGUI_API void igSetWindowCollapsedBool(bool collapsed,ImGuiCond cond); -CIMGUI_API void igSetWindowFocus(void); +CIMGUI_API void igSetWindowFocusNil(void); CIMGUI_API void igSetWindowFontScale(float scale); CIMGUI_API void igSetWindowPosStr(const char* name,const ImVec2 pos,ImGuiCond cond); CIMGUI_API void igSetWindowSizeStr(const char* name,const ImVec2 size,ImGuiCond cond); @@ -1205,7 +1205,7 @@ CIMGUI_API void igGetItemRectMin(ImVec2 *pOut); CIMGUI_API void igGetItemRectMax(ImVec2 *pOut); CIMGUI_API void igGetItemRectSize(ImVec2 *pOut); CIMGUI_API void igSetItemAllowOverlap(void); -CIMGUI_API bool igIsRectVisible(const ImVec2 size); +CIMGUI_API bool igIsRectVisibleNil(const ImVec2 size); CIMGUI_API bool igIsRectVisibleVec2(const ImVec2 rect_min,const ImVec2 rect_max); CIMGUI_API double igGetTime(void); CIMGUI_API int igGetFrameCount(void); @@ -1279,7 +1279,7 @@ CIMGUI_API bool ImGuiTextFilter_PassFilter(ImGuiTextFilter* self,const char* tex CIMGUI_API void ImGuiTextFilter_Build(ImGuiTextFilter* self); CIMGUI_API void ImGuiTextFilter_Clear(ImGuiTextFilter* self); CIMGUI_API bool ImGuiTextFilter_IsActive(ImGuiTextFilter* self); -CIMGUI_API ImGuiTextRange* ImGuiTextRange_ImGuiTextRange(void); +CIMGUI_API ImGuiTextRange* ImGuiTextRange_ImGuiTextRangeNil(void); CIMGUI_API void ImGuiTextRange_destroy(ImGuiTextRange* self); CIMGUI_API ImGuiTextRange* ImGuiTextRange_ImGuiTextRangeStr(const char* _b,const char* _e); CIMGUI_API bool ImGuiTextRange_empty(ImGuiTextRange* self); @@ -1319,7 +1319,7 @@ CIMGUI_API void ImGuiListClipper_destroy(ImGuiListClipper* self); CIMGUI_API bool ImGuiListClipper_Step(ImGuiListClipper* self); CIMGUI_API void ImGuiListClipper_Begin(ImGuiListClipper* self,int items_count,float items_height); CIMGUI_API void ImGuiListClipper_End(ImGuiListClipper* self); -CIMGUI_API ImColor* ImColor_ImColor(void); +CIMGUI_API ImColor* ImColor_ImColorNil(void); CIMGUI_API void ImColor_destroy(ImColor* self); CIMGUI_API ImColor* ImColor_ImColorInt(int r,int g,int b,int a); CIMGUI_API ImColor* ImColor_ImColorU32(ImU32 rgba); diff --git a/generator/output/definitions.json b/generator/output/definitions.json index 5d7e1ee..0f97801 100644 --- a/generator/output/definitions.json +++ b/generator/output/definitions.json @@ -52,7 +52,7 @@ "constructor": true, "defaults": [], "funcname": "ImColor", - "ov_cimguiname": "ImColor_ImColor", + "ov_cimguiname": "ImColor_ImColorNil", "signature": "()", "stname": "ImColor" }, @@ -5442,7 +5442,7 @@ "constructor": true, "defaults": [], "funcname": "ImGuiTextRange", - "ov_cimguiname": "ImGuiTextRange_ImGuiTextRange", + "ov_cimguiname": "ImGuiTextRange_ImGuiTextRangeNil", "signature": "()", "stname": "ImGuiTextRange" }, @@ -5546,7 +5546,7 @@ "constructor": true, "defaults": [], "funcname": "ImVec2", - "ov_cimguiname": "ImVec2_ImVec2", + "ov_cimguiname": "ImVec2_ImVec2Nil", "signature": "()", "stname": "ImVec2" }, @@ -5602,7 +5602,7 @@ "constructor": true, "defaults": [], "funcname": "ImVec4", - "ov_cimguiname": "ImVec4_ImVec4", + "ov_cimguiname": "ImVec4_ImVec4Nil", "signature": "()", "stname": "ImVec4" }, @@ -5666,7 +5666,7 @@ "constructor": true, "defaults": [], "funcname": "ImVector", - "ov_cimguiname": "ImVector_ImVector", + "ov_cimguiname": "ImVector_ImVectorNil", "signature": "()", "stname": "ImVector", "templated": true @@ -5730,7 +5730,7 @@ "cimguiname": "ImVector_back", "defaults": [], "funcname": "back", - "ov_cimguiname": "ImVector_back", + "ov_cimguiname": "ImVector_backNil", "ret": "T*", "retref": "&", "signature": "()", @@ -5772,7 +5772,7 @@ "cimguiname": "ImVector_begin", "defaults": [], "funcname": "begin", - "ov_cimguiname": "ImVector_begin", + "ov_cimguiname": "ImVector_beginNil", "ret": "T*", "signature": "()", "stname": "ImVector", @@ -5920,7 +5920,7 @@ "cimguiname": "ImVector_end", "defaults": [], "funcname": "end", - "ov_cimguiname": "ImVector_end", + "ov_cimguiname": "ImVector_endNil", "ret": "T*", "signature": "()", "stname": "ImVector", @@ -5964,7 +5964,7 @@ "cimguiname": "ImVector_erase", "defaults": [], "funcname": "erase", - "ov_cimguiname": "ImVector_erase", + "ov_cimguiname": "ImVector_eraseNil", "ret": "T*", "signature": "(const T*)", "stname": "ImVector", @@ -6041,7 +6041,7 @@ "cimguiname": "ImVector_find", "defaults": [], "funcname": "find", - "ov_cimguiname": "ImVector_find", + "ov_cimguiname": "ImVector_findNil", "ret": "T*", "signature": "(const T)", "stname": "ImVector", @@ -6135,7 +6135,7 @@ "cimguiname": "ImVector_front", "defaults": [], "funcname": "front", - "ov_cimguiname": "ImVector_front", + "ov_cimguiname": "ImVector_frontNil", "ret": "T*", "retref": "&", "signature": "()", @@ -6331,7 +6331,7 @@ "cimguiname": "ImVector_resize", "defaults": [], "funcname": "resize", - "ov_cimguiname": "ImVector_resize", + "ov_cimguiname": "ImVector_resizeNil", "ret": "void", "signature": "(int)", "stname": "ImVector", @@ -11197,7 +11197,7 @@ "defaults": [], "funcname": "IsRectVisible", "namespace": "ImGui", - "ov_cimguiname": "igIsRectVisible", + "ov_cimguiname": "igIsRectVisibleNil", "ret": "bool", "signature": "(const ImVec2)", "stname": "" @@ -13771,7 +13771,7 @@ "defaults": [], "funcname": "SetWindowFocus", "namespace": "ImGui", - "ov_cimguiname": "igSetWindowFocus", + "ov_cimguiname": "igSetWindowFocusNil", "ret": "void", "signature": "()", "stname": "" diff --git a/generator/output/definitions.lua b/generator/output/definitions.lua index 09df9b9..fda3004 100644 --- a/generator/output/definitions.lua +++ b/generator/output/definitions.lua @@ -43,7 +43,7 @@ defs["ImColor_ImColor"][1]["cimguiname"] = "ImColor_ImColor" defs["ImColor_ImColor"][1]["constructor"] = true defs["ImColor_ImColor"][1]["defaults"] = {} defs["ImColor_ImColor"][1]["funcname"] = "ImColor" -defs["ImColor_ImColor"][1]["ov_cimguiname"] = "ImColor_ImColor" +defs["ImColor_ImColor"][1]["ov_cimguiname"] = "ImColor_ImColorNil" defs["ImColor_ImColor"][1]["signature"] = "()" defs["ImColor_ImColor"][1]["stname"] = "ImColor" defs["ImColor_ImColor"][2] = {} @@ -4482,7 +4482,7 @@ defs["ImGuiTextRange_ImGuiTextRange"][1]["cimguiname"] = "ImGuiTextRange_ImGuiTe defs["ImGuiTextRange_ImGuiTextRange"][1]["constructor"] = true defs["ImGuiTextRange_ImGuiTextRange"][1]["defaults"] = {} defs["ImGuiTextRange_ImGuiTextRange"][1]["funcname"] = "ImGuiTextRange" -defs["ImGuiTextRange_ImGuiTextRange"][1]["ov_cimguiname"] = "ImGuiTextRange_ImGuiTextRange" +defs["ImGuiTextRange_ImGuiTextRange"][1]["ov_cimguiname"] = "ImGuiTextRange_ImGuiTextRangeNil" defs["ImGuiTextRange_ImGuiTextRange"][1]["signature"] = "()" defs["ImGuiTextRange_ImGuiTextRange"][1]["stname"] = "ImGuiTextRange" defs["ImGuiTextRange_ImGuiTextRange"][2] = {} @@ -4571,7 +4571,7 @@ defs["ImVec2_ImVec2"][1]["cimguiname"] = "ImVec2_ImVec2" defs["ImVec2_ImVec2"][1]["constructor"] = true defs["ImVec2_ImVec2"][1]["defaults"] = {} defs["ImVec2_ImVec2"][1]["funcname"] = "ImVec2" -defs["ImVec2_ImVec2"][1]["ov_cimguiname"] = "ImVec2_ImVec2" +defs["ImVec2_ImVec2"][1]["ov_cimguiname"] = "ImVec2_ImVec2Nil" defs["ImVec2_ImVec2"][1]["signature"] = "()" defs["ImVec2_ImVec2"][1]["stname"] = "ImVec2" defs["ImVec2_ImVec2"][2] = {} @@ -4620,7 +4620,7 @@ defs["ImVec4_ImVec4"][1]["cimguiname"] = "ImVec4_ImVec4" defs["ImVec4_ImVec4"][1]["constructor"] = true defs["ImVec4_ImVec4"][1]["defaults"] = {} defs["ImVec4_ImVec4"][1]["funcname"] = "ImVec4" -defs["ImVec4_ImVec4"][1]["ov_cimguiname"] = "ImVec4_ImVec4" +defs["ImVec4_ImVec4"][1]["ov_cimguiname"] = "ImVec4_ImVec4Nil" defs["ImVec4_ImVec4"][1]["signature"] = "()" defs["ImVec4_ImVec4"][1]["stname"] = "ImVec4" defs["ImVec4_ImVec4"][2] = {} @@ -4675,7 +4675,7 @@ defs["ImVector_ImVector"][1]["cimguiname"] = "ImVector_ImVector" defs["ImVector_ImVector"][1]["constructor"] = true defs["ImVector_ImVector"][1]["defaults"] = {} defs["ImVector_ImVector"][1]["funcname"] = "ImVector" -defs["ImVector_ImVector"][1]["ov_cimguiname"] = "ImVector_ImVector" +defs["ImVector_ImVector"][1]["ov_cimguiname"] = "ImVector_ImVectorNil" defs["ImVector_ImVector"][1]["signature"] = "()" defs["ImVector_ImVector"][1]["stname"] = "ImVector" defs["ImVector_ImVector"][1]["templated"] = true @@ -4730,7 +4730,7 @@ defs["ImVector_back"][1]["call_args"] = "()" defs["ImVector_back"][1]["cimguiname"] = "ImVector_back" defs["ImVector_back"][1]["defaults"] = {} defs["ImVector_back"][1]["funcname"] = "back" -defs["ImVector_back"][1]["ov_cimguiname"] = "ImVector_back" +defs["ImVector_back"][1]["ov_cimguiname"] = "ImVector_backNil" defs["ImVector_back"][1]["ret"] = "T*" defs["ImVector_back"][1]["retref"] = "&" defs["ImVector_back"][1]["signature"] = "()" @@ -4767,7 +4767,7 @@ defs["ImVector_begin"][1]["call_args"] = "()" defs["ImVector_begin"][1]["cimguiname"] = "ImVector_begin" defs["ImVector_begin"][1]["defaults"] = {} defs["ImVector_begin"][1]["funcname"] = "begin" -defs["ImVector_begin"][1]["ov_cimguiname"] = "ImVector_begin" +defs["ImVector_begin"][1]["ov_cimguiname"] = "ImVector_beginNil" defs["ImVector_begin"][1]["ret"] = "T*" defs["ImVector_begin"][1]["signature"] = "()" defs["ImVector_begin"][1]["stname"] = "ImVector" @@ -4894,7 +4894,7 @@ defs["ImVector_end"][1]["call_args"] = "()" defs["ImVector_end"][1]["cimguiname"] = "ImVector_end" defs["ImVector_end"][1]["defaults"] = {} defs["ImVector_end"][1]["funcname"] = "end" -defs["ImVector_end"][1]["ov_cimguiname"] = "ImVector_end" +defs["ImVector_end"][1]["ov_cimguiname"] = "ImVector_endNil" defs["ImVector_end"][1]["ret"] = "T*" defs["ImVector_end"][1]["signature"] = "()" defs["ImVector_end"][1]["stname"] = "ImVector" @@ -4932,7 +4932,7 @@ defs["ImVector_erase"][1]["call_args"] = "(it)" defs["ImVector_erase"][1]["cimguiname"] = "ImVector_erase" defs["ImVector_erase"][1]["defaults"] = {} defs["ImVector_erase"][1]["funcname"] = "erase" -defs["ImVector_erase"][1]["ov_cimguiname"] = "ImVector_erase" +defs["ImVector_erase"][1]["ov_cimguiname"] = "ImVector_eraseNil" defs["ImVector_erase"][1]["ret"] = "T*" defs["ImVector_erase"][1]["signature"] = "(const T*)" defs["ImVector_erase"][1]["stname"] = "ImVector" @@ -4997,7 +4997,7 @@ defs["ImVector_find"][1]["call_args"] = "(v)" defs["ImVector_find"][1]["cimguiname"] = "ImVector_find" defs["ImVector_find"][1]["defaults"] = {} defs["ImVector_find"][1]["funcname"] = "find" -defs["ImVector_find"][1]["ov_cimguiname"] = "ImVector_find" +defs["ImVector_find"][1]["ov_cimguiname"] = "ImVector_findNil" defs["ImVector_find"][1]["ret"] = "T*" defs["ImVector_find"][1]["signature"] = "(const T)" defs["ImVector_find"][1]["stname"] = "ImVector" @@ -5077,7 +5077,7 @@ defs["ImVector_front"][1]["call_args"] = "()" defs["ImVector_front"][1]["cimguiname"] = "ImVector_front" defs["ImVector_front"][1]["defaults"] = {} defs["ImVector_front"][1]["funcname"] = "front" -defs["ImVector_front"][1]["ov_cimguiname"] = "ImVector_front" +defs["ImVector_front"][1]["ov_cimguiname"] = "ImVector_frontNil" defs["ImVector_front"][1]["ret"] = "T*" defs["ImVector_front"][1]["retref"] = "&" defs["ImVector_front"][1]["signature"] = "()" @@ -5243,7 +5243,7 @@ defs["ImVector_resize"][1]["call_args"] = "(new_size)" defs["ImVector_resize"][1]["cimguiname"] = "ImVector_resize" defs["ImVector_resize"][1]["defaults"] = {} defs["ImVector_resize"][1]["funcname"] = "resize" -defs["ImVector_resize"][1]["ov_cimguiname"] = "ImVector_resize" +defs["ImVector_resize"][1]["ov_cimguiname"] = "ImVector_resizeNil" defs["ImVector_resize"][1]["ret"] = "void" defs["ImVector_resize"][1]["signature"] = "(int)" defs["ImVector_resize"][1]["stname"] = "ImVector" @@ -9370,7 +9370,7 @@ defs["igIsRectVisible"][1]["cimguiname"] = "igIsRectVisible" defs["igIsRectVisible"][1]["defaults"] = {} defs["igIsRectVisible"][1]["funcname"] = "IsRectVisible" defs["igIsRectVisible"][1]["namespace"] = "ImGui" -defs["igIsRectVisible"][1]["ov_cimguiname"] = "igIsRectVisible" +defs["igIsRectVisible"][1]["ov_cimguiname"] = "igIsRectVisibleNil" defs["igIsRectVisible"][1]["ret"] = "bool" defs["igIsRectVisible"][1]["signature"] = "(const ImVec2)" defs["igIsRectVisible"][1]["stname"] = "" @@ -11548,7 +11548,7 @@ defs["igSetWindowFocus"][1]["cimguiname"] = "igSetWindowFocus" defs["igSetWindowFocus"][1]["defaults"] = {} defs["igSetWindowFocus"][1]["funcname"] = "SetWindowFocus" defs["igSetWindowFocus"][1]["namespace"] = "ImGui" -defs["igSetWindowFocus"][1]["ov_cimguiname"] = "igSetWindowFocus" +defs["igSetWindowFocus"][1]["ov_cimguiname"] = "igSetWindowFocusNil" defs["igSetWindowFocus"][1]["ret"] = "void" defs["igSetWindowFocus"][1]["signature"] = "()" defs["igSetWindowFocus"][1]["stname"] = "" diff --git a/generator/output/overloads.txt b/generator/output/overloads.txt index 12620dc..10b29ed 100644 --- a/generator/output/overloads.txt +++ b/generator/output/overloads.txt @@ -1,9 +1,9 @@ ----------------overloadings--------------------------- ImVector_resize 2 -1 void ImVector_resize (int) +1 void ImVector_resizeNil (int) 2 void ImVector_resizeT (int,const T) ImVec4_ImVec4 2 -1 nil ImVec4_ImVec4 () +1 nil ImVec4_ImVec4Nil () 2 nil ImVec4_ImVec4Float (float,float,float,float) igValue 4 1 void igValueBool (const char*,bool) @@ -11,16 +11,16 @@ igValue 4 3 void igValueUint (const char*,unsigned int) 4 void igValueFloat (const char*,float,const char*) igIsRectVisible 2 -1 bool igIsRectVisible (const ImVec2) +1 bool igIsRectVisibleNil (const ImVec2) 2 bool igIsRectVisibleVec2 (const ImVec2,const ImVec2) igRadioButton 2 1 bool igRadioButtonBool (const char*,bool) 2 bool igRadioButtonIntPtr (const char*,int*,int) ImGuiTextRange_ImGuiTextRange 2 -1 nil ImGuiTextRange_ImGuiTextRange () +1 nil ImGuiTextRange_ImGuiTextRangeNil () 2 nil ImGuiTextRange_ImGuiTextRangeStr (const char*,const char*) ImVector_back 2 -1 T* ImVector_back () +1 T* ImVector_backNil () 2 const T* ImVector_back_const ()const igPlotHistogram 2 1 void igPlotHistogramFloatPtr (const char*,const float*,int,int,const char*,float,float,ImVec2,int) @@ -53,7 +53,7 @@ igCombo 3 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*) +1 T* ImVector_eraseNil (const T*) 2 T* ImVector_eraseTPtr (const T*,const T*) ImDrawList_AddText 2 1 void ImDrawList_AddTextVec2 (const ImVec2,ImU32,const char*,const char*) @@ -62,16 +62,16 @@ igPushStyleVar 2 1 void igPushStyleVarFloat (ImGuiStyleVar,float) 2 void igPushStyleVarVec2 (ImGuiStyleVar,const ImVec2) igSetWindowFocus 2 -1 void igSetWindowFocus () +1 void igSetWindowFocusNil () 2 void igSetWindowFocusStr (const char*) ImVector_end 2 -1 T* ImVector_end () +1 T* ImVector_endNil () 2 const T* ImVector_end_const ()const igSetWindowSize 2 1 void igSetWindowSizeVec2 (const ImVec2,ImGuiCond) 2 void igSetWindowSizeStr (const char*,const ImVec2,ImGuiCond) ImVector_ImVector 2 -1 nil ImVector_ImVector () +1 nil ImVector_ImVectorNil () 2 nil ImVector_ImVectorVector (const ImVector) igSetWindowCollapsed 2 1 void igSetWindowCollapsedBool (bool,ImGuiCond) @@ -89,7 +89,7 @@ igListBox 2 1 bool igListBoxStr_arr (const char*,int*,const char* const[],int,int) 2 bool igListBoxFnPtr (const char*,int*,bool(*)(void*,int,const char**),void*,int,int) ImVec2_ImVec2 2 -1 nil ImVec2_ImVec2 () +1 nil ImVec2_ImVec2Nil () 2 nil ImVec2_ImVec2Float (float,float) igCollapsingHeader 2 1 bool igCollapsingHeaderTreeNodeFlags (const char*,ImGuiTreeNodeFlags) @@ -102,7 +102,7 @@ igGetColorU32 3 2 ImU32 igGetColorU32Vec4 (const ImVec4) 3 ImU32 igGetColorU32U32 (ImU32) ImColor_ImColor 5 -1 nil ImColor_ImColor () +1 nil ImColor_ImColorNil () 2 nil ImColor_ImColorInt (int,int,int,int) 3 nil ImColor_ImColorU32 (ImU32) 4 nil ImColor_ImColorFloat (float,float,float,float) @@ -111,13 +111,13 @@ igSelectable 2 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 () +1 T* ImVector_beginNil () 2 const T* ImVector_begin_const ()const ImVector_front 2 -1 T* ImVector_front () +1 T* ImVector_frontNil () 2 const T* ImVector_front_const ()const ImVector_find 2 -1 T* ImVector_find (const T) +1 T* ImVector_findNil (const T) 2 const T* ImVector_find_const (const T)const igTreeNodeEx 3 1 bool igTreeNodeExStr (const char*,ImGuiTreeNodeFlags)