Merge pull request #127 from cimgui/simplify

Simplify

README.md

@@ -12,9 +12,10 @@ Initially cimgui was developed by Stephan Dilly as hand-written code but lately
 
 Notes:
 * currently this wrapper is based on version [1.75 of Dear ImGui]
-* only functions, structs and enums from imgui.h are wrapped.
+* only functions, structs and enums from imgui.h (an optionally imgui_internal.h) are wrapped.
 * if you are interested in imgui implementations you should look LuaJIT-ImGui project.
-* overloaded function names try to be the most compatible with traditional cimgui names. So all naming is algorithmic except for those names that were in conflict with widely used cimgui names and were thus coded in a table (https://github.com/cimgui/cimgui/blob/master/generator/generator.lua#L58). Current overloaded function names can be found in (https://github.com/cimgui/cimgui/blob/master/generator/output/overloads.txt)
+* All naming is algorithmic except for those names that were coded in cimgui_overloads table (https://github.com/cimgui/cimgui/blob/master/generator/generator.lua#L60). In the official version this table is empty.
+* Current overloaded function names can be found in (https://github.com/cimgui/cimgui/blob/master/generator/output/overloads.txt)
 
 # compilation
 
@@ -23,7 +24,7 @@ Notes:
   * git submodule update
 * compile 
   * using makefile on linux/macOS/mingw (Or use CMake to generate project)
-  * or as in https://github.com/sonoro1234/LuaJIT-ImGui/tree/master_auto_implementations/build
+  * or as in https://github.com/sonoro1234/LuaJIT-ImGui/tree/master/build
 
 # using generator
 
@@ -31,15 +32,15 @@ Notes:
 * you will need LuaJIT (https://github.com/LuaJIT/LuaJIT.git better 2.1 branch) or precompiled for linux/macOS/windows in https://luapower.com/luajit/download
 * you can use also a C++ compiler for doing preprocessing: gcc (In windows MinGW-W64-builds for example), clang or cl (MSVC) or not use a compiler (experimental nocompiler option) at all. (this repo was done with gcc)
 * update `imgui` folder to the version you desire.
-* edit `generator/generator.bat` on windows, or `generator/generator.sh` on linux, to choose between gcc, clang, cl or nocompiler and to choose desired implementations and if imgui_internal is generated or not. 
-* edit config_generator.lua for adding includes needed by your chosen implementations.
+* edit `generator/generator.bat` on windows, or `generator/generator.sh` on linux, to choose between gcc, clang, cl or nocompiler and to choose desired implementations and weather imgui_internal is generated or not. 
+* edit config_generator.lua for adding includes needed by your chosen implementations (vulkan needs that).
 * Run generator.bat or generator.sh with gcc, clang or cl and LuaJIT on your PATH.
 * as a result some files are generated: `cimgui.cpp` and `cimgui.h` for compiling and some lua/json files with information about the binding: `definitions.json` with function info, `structs_and_enums.json` with struct and enum info, `impl_definitions.json` with functions from the implementations info. 
 
 # generate binding
 * C interface is exposed by cimgui.h when you define CIMGUI_DEFINE_ENUMS_AND_STRUCTS
 * with your prefered language you can use the lua or json files generated as in:
-  * https://github.com/sonoro1234/LuaJIT-ImGui/blob/master_auto_implementations/lua/build.bat (with lua code generation in https://github.com/sonoro1234/LuaJIT-ImGui/blob/master_auto_implementations/lua/class_gen.lua)
+  * https://github.com/sonoro1234/LuaJIT-ImGui/blob/master/lua/build.bat (with lua code generation in https://github.com/sonoro1234/LuaJIT-ImGui/blob/master/lua/class_gen.lua)
   * https://github.com/mellinoe/ImGui.NET/tree/autogen/src/CodeGenerator
 ### definitions description
 * It is a collection in which key is the cimgui name that would result without overloadings and the value is an array of overloadings (may be only one overloading)
@@ -59,7 +60,7 @@ Notes:
   * destructor : is set if the function is a destructor for a class
   * templated : is set if the function belongs to a templated class (ImVector)
   * templatedgen: is set if the function belongs to a struct generated from template (ImVector_ImWchar)
-  * nonUDT : if present can be 1 or 2 (explained meaning in usage) if return type was a user defined type
+  * nonUDT : if present the original function was returning a user defined type so that signature has been changed to accept a pointer to the UDT as first argument.
 ### structs_and_enums description
 * Is is a collection with two items:
   * under key enums we get the enums collection in which each key is the enum tagname and the value is an array of the ordered values represented as a collection with keys
@@ -76,8 +77,7 @@ Notes:
 * use whatever method is in ImGui c++ namespace in the original [imgui.h](https://github.com/ocornut/imgui/blob/master/imgui.h) by prepending `ig`
 * methods have the same parameter list and return values (where possible)
 * functions that belong to a struct have an extra first argument with a pointer to the struct.
-* where a function returns UDT (user defined type) by value some compilers complain so another function with the name `function_name_nonUDT` is generated accepting a pointer to the UDT type as the first argument.
-* also is generated `function_name_nonUDT2` which instead of returning the UDT type returns a simple version (without functions) called `UDTType_Simple` (`ImVec2_Simple` for `ImVec2`)
+* where a function returns UDT (user defined type) by value some compilers complain so the function is generated accepting a pointer to the UDT type as the first argument (or second if belongs to a struct).
 
 # example bindings based on cimgui
 

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)();
 }
@@ -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);
 }
@@ -159,13 +159,13 @@ CIMGUI_API ImDrawList* igGetWindowDrawList()
 {
     return ImGui::GetWindowDrawList();
 }
-CIMGUI_API ImVec2 igGetWindowPos()
+CIMGUI_API void igGetWindowPos(ImVec2 *pOut)
 {
-    return ImGui::GetWindowPos();
+    *pOut = ImGui::GetWindowPos();
 }
-CIMGUI_API ImVec2 igGetWindowSize()
+CIMGUI_API void igGetWindowSize(ImVec2 *pOut)
 {
-    return ImGui::GetWindowSize();
+    *pOut = ImGui::GetWindowSize();
 }
 CIMGUI_API float igGetWindowWidth()
 {
@@ -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();
 }
@@ -239,21 +239,21 @@ CIMGUI_API void igSetWindowFocusStr(const char* name)
 {
     return ImGui::SetWindowFocus(name);
 }
-CIMGUI_API ImVec2 igGetContentRegionMax()
+CIMGUI_API void igGetContentRegionMax(ImVec2 *pOut)
 {
-    return ImGui::GetContentRegionMax();
+    *pOut = ImGui::GetContentRegionMax();
 }
-CIMGUI_API ImVec2 igGetContentRegionAvail()
+CIMGUI_API void igGetContentRegionAvail(ImVec2 *pOut)
 {
-    return ImGui::GetContentRegionAvail();
+    *pOut = ImGui::GetContentRegionAvail();
 }
-CIMGUI_API ImVec2 igGetWindowContentRegionMin()
+CIMGUI_API void igGetWindowContentRegionMin(ImVec2 *pOut)
 {
-    return ImGui::GetWindowContentRegionMin();
+    *pOut = ImGui::GetWindowContentRegionMin();
 }
-CIMGUI_API ImVec2 igGetWindowContentRegionMax()
+CIMGUI_API void igGetWindowContentRegionMax(ImVec2 *pOut)
 {
-    return ImGui::GetWindowContentRegionMax();
+    *pOut = ImGui::GetWindowContentRegionMax();
 }
 CIMGUI_API float igGetWindowContentRegionWidth()
 {
@@ -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);
 }
@@ -343,11 +343,11 @@ CIMGUI_API float igGetFontSize()
 {
     return ImGui::GetFontSize();
 }
-CIMGUI_API ImVec2 igGetFontTexUvWhitePixel()
+CIMGUI_API void igGetFontTexUvWhitePixel(ImVec2 *pOut)
 {
-    return ImGui::GetFontTexUvWhitePixel();
+    *pOut = 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);
 }
@@ -435,9 +435,9 @@ CIMGUI_API void igEndGroup()
 {
     return ImGui::EndGroup();
 }
-CIMGUI_API ImVec2 igGetCursorPos()
+CIMGUI_API void igGetCursorPos(ImVec2 *pOut)
 {
-    return ImGui::GetCursorPos();
+    *pOut = ImGui::GetCursorPos();
 }
 CIMGUI_API float igGetCursorPosX()
 {
@@ -459,13 +459,13 @@ CIMGUI_API void igSetCursorPosY(float local_y)
 {
     return ImGui::SetCursorPosY(local_y);
 }
-CIMGUI_API ImVec2 igGetCursorStartPos()
+CIMGUI_API void igGetCursorStartPos(ImVec2 *pOut)
 {
-    return ImGui::GetCursorStartPos();
+    *pOut = ImGui::GetCursorStartPos();
 }
-CIMGUI_API ImVec2 igGetCursorScreenPos()
+CIMGUI_API void igGetCursorScreenPos(ImVec2 *pOut)
 {
-    return ImGui::GetCursorScreenPos();
+    *pOut = ImGui::GetCursorScreenPos();
 }
 CIMGUI_API void igSetCursorScreenPos(const ImVec2 pos)
 {
@@ -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);
 }
@@ -1248,23 +1248,23 @@ CIMGUI_API bool igIsAnyItemFocused()
 {
     return ImGui::IsAnyItemFocused();
 }
-CIMGUI_API ImVec2 igGetItemRectMin()
+CIMGUI_API void igGetItemRectMin(ImVec2 *pOut)
 {
-    return ImGui::GetItemRectMin();
+    *pOut = ImGui::GetItemRectMin();
 }
-CIMGUI_API ImVec2 igGetItemRectMax()
+CIMGUI_API void igGetItemRectMax(ImVec2 *pOut)
 {
-    return ImGui::GetItemRectMax();
+    *pOut = ImGui::GetItemRectMax();
 }
-CIMGUI_API ImVec2 igGetItemRectSize()
+CIMGUI_API void igGetItemRectSize(ImVec2 *pOut)
 {
-    return ImGui::GetItemRectSize();
+    *pOut = ImGui::GetItemRectSize();
 }
 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);
 }
@@ -1304,9 +1304,9 @@ CIMGUI_API ImGuiStorage* igGetStateStorage()
 {
     return ImGui::GetStateStorage();
 }
-CIMGUI_API ImVec2 igCalcTextSize(const char* text,const char* text_end,bool hide_text_after_double_hash,float wrap_width)
+CIMGUI_API void igCalcTextSize(ImVec2 *pOut,const char* text,const char* text_end,bool hide_text_after_double_hash,float wrap_width)
 {
-    return ImGui::CalcTextSize(text,text_end,hide_text_after_double_hash,wrap_width);
+    *pOut = ImGui::CalcTextSize(text,text_end,hide_text_after_double_hash,wrap_width);
 }
 CIMGUI_API void igCalcListClipping(int items_count,float items_height,int* out_items_display_start,int* out_items_display_end)
 {
@@ -1320,9 +1320,9 @@ CIMGUI_API void igEndChildFrame()
 {
     return ImGui::EndChildFrame();
 }
-CIMGUI_API ImVec4 igColorConvertU32ToFloat4(ImU32 in)
+CIMGUI_API void igColorConvertU32ToFloat4(ImVec4 *pOut,ImU32 in)
 {
-    return ImGui::ColorConvertU32ToFloat4(in);
+    *pOut = ImGui::ColorConvertU32ToFloat4(in);
 }
 CIMGUI_API ImU32 igColorConvertFloat4ToU32(const ImVec4 in)
 {
@@ -1380,21 +1380,21 @@ CIMGUI_API bool igIsAnyMouseDown()
 {
     return ImGui::IsAnyMouseDown();
 }
-CIMGUI_API ImVec2 igGetMousePos()
+CIMGUI_API void igGetMousePos(ImVec2 *pOut)
 {
-    return ImGui::GetMousePos();
+    *pOut = ImGui::GetMousePos();
 }
-CIMGUI_API ImVec2 igGetMousePosOnOpeningCurrentPopup()
+CIMGUI_API void igGetMousePosOnOpeningCurrentPopup(ImVec2 *pOut)
 {
-    return ImGui::GetMousePosOnOpeningCurrentPopup();
+    *pOut = ImGui::GetMousePosOnOpeningCurrentPopup();
 }
 CIMGUI_API bool igIsMouseDragging(ImGuiMouseButton button,float lock_threshold)
 {
     return ImGui::IsMouseDragging(button,lock_threshold);
 }
-CIMGUI_API ImVec2 igGetMouseDragDelta(ImGuiMouseButton button,float lock_threshold)
+CIMGUI_API void igGetMouseDragDelta(ImVec2 *pOut,ImGuiMouseButton button,float lock_threshold)
 {
-    return ImGui::GetMouseDragDelta(button,lock_threshold);
+    *pOut = ImGui::GetMouseDragDelta(button,lock_threshold);
 }
 CIMGUI_API void igResetMouseDragDelta(ImGuiMouseButton button)
 {
@@ -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)();
 }
@@ -1748,9 +1748,9 @@ CIMGUI_API void ImColor_SetHSV(ImColor* self,float h,float s,float v,float a)
 {
     return self->SetHSV(h,s,v,a);
 }
-CIMGUI_API ImColor ImColor_HSV(ImColor* self,float h,float s,float v,float a)
+CIMGUI_API void ImColor_HSV(ImColor *pOut,ImColor* self,float h,float s,float v,float a)
 {
-    return self->HSV(h,s,v,a);
+    *pOut = self->HSV(h,s,v,a);
 }
 CIMGUI_API ImDrawCmd* ImDrawCmd_ImDrawCmd(void)
 {
@@ -1816,13 +1816,13 @@ CIMGUI_API void ImDrawList_PopTextureID(ImDrawList* self)
 {
     return self->PopTextureID();
 }
-CIMGUI_API ImVec2 ImDrawList_GetClipRectMin(ImDrawList* self)
+CIMGUI_API void ImDrawList_GetClipRectMin(ImVec2 *pOut,ImDrawList* self)
 {
-    return self->GetClipRectMin();
+    *pOut = self->GetClipRectMin();
 }
-CIMGUI_API ImVec2 ImDrawList_GetClipRectMax(ImDrawList* self)
+CIMGUI_API void ImDrawList_GetClipRectMax(ImVec2 *pOut,ImDrawList* self)
 {
-    return self->GetClipRectMax();
+    *pOut = self->GetClipRectMax();
 }
 CIMGUI_API void ImDrawList_AddLine(ImDrawList* self,const ImVec2 p1,const ImVec2 p2,ImU32 col,float thickness)
 {
@@ -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);
 }
@@ -2236,9 +2236,9 @@ CIMGUI_API const char* ImFont_GetDebugName(ImFont* self)
 {
     return self->GetDebugName();
 }
-CIMGUI_API ImVec2 ImFont_CalcTextSizeA(ImFont* self,float size,float max_width,float wrap_width,const char* text_begin,const char* text_end,const char** remaining)
+CIMGUI_API void ImFont_CalcTextSizeA(ImVec2 *pOut,ImFont* self,float size,float max_width,float wrap_width,const char* text_begin,const char* text_end,const char** remaining)
 {
-    return self->CalcTextSizeA(size,max_width,wrap_width,text_begin,text_end,remaining);
+    *pOut = self->CalcTextSizeA(size,max_width,wrap_width,text_begin,text_end,remaining);
 }
 CIMGUI_API const char* ImFont_CalcWordWrapPositionA(ImFont* self,float scale,const char* text,const char* text_end,float wrap_width)
 {
@@ -2276,226 +2276,6 @@ CIMGUI_API void ImFont_SetFallbackChar(ImFont* self,ImWchar c)
 {
     return self->SetFallbackChar(c);
 }
-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;
-}
 
 
 

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
@@ -927,10 +900,10 @@ typedef ImVector<ImVec4> ImVector_ImVec4;
 typedef ImVector<ImDrawIdx> ImVector_ImDrawIdx;
 typedef ImVector<ImVec2> 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);
@@ -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);
@@ -965,8 +938,8 @@ CIMGUI_API bool igIsWindowCollapsed(void);
 CIMGUI_API bool igIsWindowFocused(ImGuiFocusedFlags flags);
 CIMGUI_API bool igIsWindowHovered(ImGuiHoveredFlags flags);
 CIMGUI_API ImDrawList* igGetWindowDrawList(void);
-CIMGUI_API ImVec2 igGetWindowPos(void);
-CIMGUI_API ImVec2 igGetWindowSize(void);
+CIMGUI_API void igGetWindowPos(ImVec2 *pOut);
+CIMGUI_API void igGetWindowSize(ImVec2 *pOut);
 CIMGUI_API float igGetWindowWidth(void);
 CIMGUI_API float igGetWindowHeight(void);
 CIMGUI_API void igSetNextWindowPos(const ImVec2 pos,ImGuiCond cond,const ImVec2 pivot);
@@ -979,16 +952,16 @@ 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);
 CIMGUI_API void igSetWindowCollapsedStr(const char* name,bool collapsed,ImGuiCond cond);
 CIMGUI_API void igSetWindowFocusStr(const char* name);
-CIMGUI_API ImVec2 igGetContentRegionMax(void);
-CIMGUI_API ImVec2 igGetContentRegionAvail(void);
-CIMGUI_API ImVec2 igGetWindowContentRegionMin(void);
-CIMGUI_API ImVec2 igGetWindowContentRegionMax(void);
+CIMGUI_API void igGetContentRegionMax(ImVec2 *pOut);
+CIMGUI_API void igGetContentRegionAvail(ImVec2 *pOut);
+CIMGUI_API void igGetWindowContentRegionMin(ImVec2 *pOut);
+CIMGUI_API void igGetWindowContentRegionMax(ImVec2 *pOut);
 CIMGUI_API float igGetWindowContentRegionWidth(void);
 CIMGUI_API float igGetScrollX(void);
 CIMGUI_API float igGetScrollY(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);
@@ -1011,8 +984,8 @@ CIMGUI_API void igPopStyleVar(int count);
 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 void igGetFontTexUvWhitePixel(ImVec2 *pOut);
+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);
@@ -1034,14 +1007,14 @@ CIMGUI_API void igIndent(float indent_w);
 CIMGUI_API void igUnindent(float indent_w);
 CIMGUI_API void igBeginGroup(void);
 CIMGUI_API void igEndGroup(void);
-CIMGUI_API ImVec2 igGetCursorPos(void);
+CIMGUI_API void igGetCursorPos(ImVec2 *pOut);
 CIMGUI_API float igGetCursorPosX(void);
 CIMGUI_API float igGetCursorPosY(void);
 CIMGUI_API void igSetCursorPos(const ImVec2 local_pos);
 CIMGUI_API void igSetCursorPosX(float local_x);
 CIMGUI_API void igSetCursorPosY(float local_y);
-CIMGUI_API ImVec2 igGetCursorStartPos(void);
-CIMGUI_API ImVec2 igGetCursorScreenPos(void);
+CIMGUI_API void igGetCursorStartPos(ImVec2 *pOut);
+CIMGUI_API void igGetCursorScreenPos(ImVec2 *pOut);
 CIMGUI_API void igSetCursorScreenPos(const ImVec2 pos);
 CIMGUI_API void igAlignTextToFramePadding(void);
 CIMGUI_API float igGetTextLineHeight(void);
@@ -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);
@@ -1228,11 +1201,11 @@ CIMGUI_API bool igIsItemToggledOpen(void);
 CIMGUI_API bool igIsAnyItemHovered(void);
 CIMGUI_API bool igIsAnyItemActive(void);
 CIMGUI_API bool igIsAnyItemFocused(void);
-CIMGUI_API ImVec2 igGetItemRectMin(void);
-CIMGUI_API ImVec2 igGetItemRectMax(void);
-CIMGUI_API ImVec2 igGetItemRectSize(void);
+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);
@@ -1242,11 +1215,11 @@ CIMGUI_API ImDrawListSharedData* igGetDrawListSharedData(void);
 CIMGUI_API const char* igGetStyleColorName(ImGuiCol idx);
 CIMGUI_API void igSetStateStorage(ImGuiStorage* storage);
 CIMGUI_API ImGuiStorage* igGetStateStorage(void);
-CIMGUI_API ImVec2 igCalcTextSize(const char* text,const char* text_end,bool hide_text_after_double_hash,float wrap_width);
+CIMGUI_API void igCalcTextSize(ImVec2 *pOut,const char* text,const char* text_end,bool hide_text_after_double_hash,float wrap_width);
 CIMGUI_API void igCalcListClipping(int items_count,float items_height,int* out_items_display_start,int* out_items_display_end);
 CIMGUI_API bool igBeginChildFrame(ImGuiID id,const ImVec2 size,ImGuiWindowFlags flags);
 CIMGUI_API void igEndChildFrame(void);
-CIMGUI_API ImVec4 igColorConvertU32ToFloat4(ImU32 in);
+CIMGUI_API void igColorConvertU32ToFloat4(ImVec4 *pOut,ImU32 in);
 CIMGUI_API ImU32 igColorConvertFloat4ToU32(const ImVec4 in);
 CIMGUI_API int igGetKeyIndex(ImGuiKey imgui_key);
 CIMGUI_API bool igIsKeyDown(int user_key_index);
@@ -1261,10 +1234,10 @@ CIMGUI_API bool igIsMouseDoubleClicked(ImGuiMouseButton button);
 CIMGUI_API bool igIsMouseHoveringRect(const ImVec2 r_min,const ImVec2 r_max,bool clip);
 CIMGUI_API bool igIsMousePosValid(const ImVec2* mouse_pos);
 CIMGUI_API bool igIsAnyMouseDown(void);
-CIMGUI_API ImVec2 igGetMousePos(void);
-CIMGUI_API ImVec2 igGetMousePosOnOpeningCurrentPopup(void);
+CIMGUI_API void igGetMousePos(ImVec2 *pOut);
+CIMGUI_API void igGetMousePosOnOpeningCurrentPopup(ImVec2 *pOut);
 CIMGUI_API bool igIsMouseDragging(ImGuiMouseButton button,float lock_threshold);
-CIMGUI_API ImVec2 igGetMouseDragDelta(ImGuiMouseButton button,float lock_threshold);
+CIMGUI_API void igGetMouseDragDelta(ImVec2 *pOut,ImGuiMouseButton button,float lock_threshold);
 CIMGUI_API void igResetMouseDragDelta(ImGuiMouseButton button);
 CIMGUI_API ImGuiMouseCursor igGetMouseCursor(void);
 CIMGUI_API void igSetMouseCursor(ImGuiMouseCursor cursor_type);
@@ -1306,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);
@@ -1346,14 +1319,14 @@ 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);
 CIMGUI_API ImColor* ImColor_ImColorFloat(float r,float g,float b,float a);
 CIMGUI_API ImColor* ImColor_ImColorVec4(const ImVec4 col);
 CIMGUI_API void ImColor_SetHSV(ImColor* self,float h,float s,float v,float a);
-CIMGUI_API ImColor ImColor_HSV(ImColor* self,float h,float s,float v,float a);
+CIMGUI_API void ImColor_HSV(ImColor *pOut,ImColor* self,float h,float s,float v,float a);
 CIMGUI_API ImDrawCmd* ImDrawCmd_ImDrawCmd(void);
 CIMGUI_API void ImDrawCmd_destroy(ImDrawCmd* self);
 CIMGUI_API ImDrawListSplitter* ImDrawListSplitter_ImDrawListSplitter(void);
@@ -1370,8 +1343,8 @@ CIMGUI_API void ImDrawList_PushClipRectFullScreen(ImDrawList* self);
 CIMGUI_API void ImDrawList_PopClipRect(ImDrawList* self);
 CIMGUI_API void ImDrawList_PushTextureID(ImDrawList* self,ImTextureID texture_id);
 CIMGUI_API void ImDrawList_PopTextureID(ImDrawList* self);
-CIMGUI_API ImVec2 ImDrawList_GetClipRectMin(ImDrawList* self);
-CIMGUI_API ImVec2 ImDrawList_GetClipRectMax(ImDrawList* self);
+CIMGUI_API void ImDrawList_GetClipRectMin(ImVec2 *pOut,ImDrawList* self);
+CIMGUI_API void ImDrawList_GetClipRectMax(ImVec2 *pOut,ImDrawList* self);
 CIMGUI_API void ImDrawList_AddLine(ImDrawList* self,const ImVec2 p1,const ImVec2 p2,ImU32 col,float thickness);
 CIMGUI_API void ImDrawList_AddRect(ImDrawList* self,const ImVec2 p_min,const ImVec2 p_max,ImU32 col,float rounding,ImDrawCornerFlags rounding_corners,float thickness);
 CIMGUI_API void ImDrawList_AddRectFilled(ImDrawList* self,const ImVec2 p_min,const ImVec2 p_max,ImU32 col,float rounding,ImDrawCornerFlags rounding_corners);
@@ -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);
@@ -1475,7 +1448,7 @@ CIMGUI_API const ImFontGlyph* ImFont_FindGlyphNoFallback(ImFont* self,ImWchar c)
 CIMGUI_API float ImFont_GetCharAdvance(ImFont* self,ImWchar c);
 CIMGUI_API bool ImFont_IsLoaded(ImFont* self);
 CIMGUI_API const char* ImFont_GetDebugName(ImFont* self);
-CIMGUI_API ImVec2 ImFont_CalcTextSizeA(ImFont* self,float size,float max_width,float wrap_width,const char* text_begin,const char* text_end,const char** remaining);
+CIMGUI_API void ImFont_CalcTextSizeA(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 const char* ImFont_CalcWordWrapPositionA(ImFont* self,float scale,const char* text,const char* text_end,float wrap_width);
 CIMGUI_API void ImFont_RenderChar(ImFont* self,ImDrawList* draw_list,float size,ImVec2 pos,ImU32 col,ImWchar c);
 CIMGUI_API void ImFont_RenderText(ImFont* self,ImDrawList* draw_list,float size,ImVec2 pos,ImU32 col,const ImVec4 clip_rect,const char* text_begin,const char* text_end,float wrap_width,bool cpu_fine_clip);
@@ -1485,50 +1458,6 @@ CIMGUI_API void ImFont_GrowIndex(ImFont* self,int new_size);
 CIMGUI_API void ImFont_AddGlyph(ImFont* self,ImWchar c,float x0,float y0,float x1,float y1,float u0,float v0,float u1,float v1,float advance_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

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"

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)
@@ -600,14 +602,16 @@ local function AdjustArguments(FP)
 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}
+    --local newcdefs = {}
     for numcdef,t in ipairs(FP.funcdefs) do
         if t.cimguiname then
         local cimf = defsT[t.cimguiname]
         local defT = cimf[t.signature]
+		--find index
+		local index
+		for ind,ddd in ipairs(cimf) do
+			if ddd == defT then index=ind; break end
+		end
         --if UDT return generate nonUDT version
 		local isUDT = false
 		for _,udt_ret in ipairs(FP.UDTs) do
@@ -629,40 +633,25 @@ local function ADDnonUDT(FP)
             local comma = (#defT.argsT > 0) and "," or ""
             defT2.args = "("..defT.ret.." *pOut"..comma..defT.args:sub(2)
             defT2.ret = "void"
-            defT2.ov_cimguiname = (defT2.ov_cimguiname or defT2.cimguiname).."_nonUDT"
+            defT2.ov_cimguiname = (defT2.ov_cimguiname or defT2.cimguiname) --.."_nonUDT"
             defT2.nonUDT = 1
             defT2.retref = nil
-            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})
+			
+			--replace
+			cimf[index] = defT2
+			cimf[t.signature] = defT2
+			FP.funcdefs[numcdef] = {stname=t.stname,funcname=t.funcname,args=args,argsc=argscsinpars,signature=t.signature,cimguiname=t.cimguiname,call_args=call_args,ret =t.ret}
+			
+            -- 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})
         end
+		else print("not cimguiname in");M.prtable(t)
         end
-		--end
-    end
-    for i,v in ipairs(newcdefs) do
-        table.insert(FP.funcdefs,v)
     end
+    -- for i,v in ipairs(newcdefs) do
+        -- table.insert(FP.funcdefs,v)
+    -- end
 end
 
 local function ADDdestructors(FP)
@@ -1179,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 

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")

generator/generator_old.bat

@@ -1,23 +0,0 @@
-:: this script must be executed in this directory
-:: all the output goes to generator/output folder
-:: .cpp and .h files:
-:: cimgui.h and cimgui.cpp with gcc preprocess
-:: cimgui_nopreprocess.h and cimgui_nopreprocess.cpp generated without preprocess
-:: cimgui_impl.h with implementation function cdefs
-:: lua and json files:
-:: definitions.lua for function definitions
-:: structs_and_enums.lua with struct and enum information-definitions
-:: impl_definitions.lua for implementation function definitions
-
-:: set your PATH if necessary for LuaJIT or Lua5.1 or luajit with: (for example)
-set PATH=%PATH%;C:\luaGL;C:\mingw32\bin;
-:: set PATH=%PATH%;C:\luaGL;C:\i686-7.2.0-release-posix-dwarf-rt_v5-rev1\mingw32\bin;
-:: set PATH=%PATH%;C:\luaGL\sources\luajit-master\luajit-master\bin\mingw32;C:\mingw32\bin;
-::process  files
-:: arg[1] compiler name gcc, clang, cl or nocompiler
-:: arg[2..n] name of implementations to generate
-luajit ./generator_old.lua gcc glfw opengl3 opengl2 sdl
-
-::leave console open
-cmd /k
-

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)();
 }
@@ -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);
 }
@@ -159,13 +159,13 @@ CIMGUI_API ImDrawList* igGetWindowDrawList()
 {
     return ImGui::GetWindowDrawList();
 }
-CIMGUI_API ImVec2 igGetWindowPos()
+CIMGUI_API void igGetWindowPos(ImVec2 *pOut)
 {
-    return ImGui::GetWindowPos();
+    *pOut = ImGui::GetWindowPos();
 }
-CIMGUI_API ImVec2 igGetWindowSize()
+CIMGUI_API void igGetWindowSize(ImVec2 *pOut)
 {
-    return ImGui::GetWindowSize();
+    *pOut = ImGui::GetWindowSize();
 }
 CIMGUI_API float igGetWindowWidth()
 {
@@ -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();
 }
@@ -239,21 +239,21 @@ CIMGUI_API void igSetWindowFocusStr(const char* name)
 {
     return ImGui::SetWindowFocus(name);
 }
-CIMGUI_API ImVec2 igGetContentRegionMax()
+CIMGUI_API void igGetContentRegionMax(ImVec2 *pOut)
 {
-    return ImGui::GetContentRegionMax();
+    *pOut = ImGui::GetContentRegionMax();
 }
-CIMGUI_API ImVec2 igGetContentRegionAvail()
+CIMGUI_API void igGetContentRegionAvail(ImVec2 *pOut)
 {
-    return ImGui::GetContentRegionAvail();
+    *pOut = ImGui::GetContentRegionAvail();
 }
-CIMGUI_API ImVec2 igGetWindowContentRegionMin()
+CIMGUI_API void igGetWindowContentRegionMin(ImVec2 *pOut)
 {
-    return ImGui::GetWindowContentRegionMin();
+    *pOut = ImGui::GetWindowContentRegionMin();
 }
-CIMGUI_API ImVec2 igGetWindowContentRegionMax()
+CIMGUI_API void igGetWindowContentRegionMax(ImVec2 *pOut)
 {
-    return ImGui::GetWindowContentRegionMax();
+    *pOut = ImGui::GetWindowContentRegionMax();
 }
 CIMGUI_API float igGetWindowContentRegionWidth()
 {
@@ -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);
 }
@@ -343,11 +343,11 @@ CIMGUI_API float igGetFontSize()
 {
     return ImGui::GetFontSize();
 }
-CIMGUI_API ImVec2 igGetFontTexUvWhitePixel()
+CIMGUI_API void igGetFontTexUvWhitePixel(ImVec2 *pOut)
 {
-    return ImGui::GetFontTexUvWhitePixel();
+    *pOut = 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);
 }
@@ -435,9 +435,9 @@ CIMGUI_API void igEndGroup()
 {
     return ImGui::EndGroup();
 }
-CIMGUI_API ImVec2 igGetCursorPos()
+CIMGUI_API void igGetCursorPos(ImVec2 *pOut)
 {
-    return ImGui::GetCursorPos();
+    *pOut = ImGui::GetCursorPos();
 }
 CIMGUI_API float igGetCursorPosX()
 {
@@ -459,13 +459,13 @@ CIMGUI_API void igSetCursorPosY(float local_y)
 {
     return ImGui::SetCursorPosY(local_y);
 }
-CIMGUI_API ImVec2 igGetCursorStartPos()
+CIMGUI_API void igGetCursorStartPos(ImVec2 *pOut)
 {
-    return ImGui::GetCursorStartPos();
+    *pOut = ImGui::GetCursorStartPos();
 }
-CIMGUI_API ImVec2 igGetCursorScreenPos()
+CIMGUI_API void igGetCursorScreenPos(ImVec2 *pOut)
 {
-    return ImGui::GetCursorScreenPos();
+    *pOut = ImGui::GetCursorScreenPos();
 }
 CIMGUI_API void igSetCursorScreenPos(const ImVec2 pos)
 {
@@ -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);
 }
@@ -1248,23 +1248,23 @@ CIMGUI_API bool igIsAnyItemFocused()
 {
     return ImGui::IsAnyItemFocused();
 }
-CIMGUI_API ImVec2 igGetItemRectMin()
+CIMGUI_API void igGetItemRectMin(ImVec2 *pOut)
 {
-    return ImGui::GetItemRectMin();
+    *pOut = ImGui::GetItemRectMin();
 }
-CIMGUI_API ImVec2 igGetItemRectMax()
+CIMGUI_API void igGetItemRectMax(ImVec2 *pOut)
 {
-    return ImGui::GetItemRectMax();
+    *pOut = ImGui::GetItemRectMax();
 }
-CIMGUI_API ImVec2 igGetItemRectSize()
+CIMGUI_API void igGetItemRectSize(ImVec2 *pOut)
 {
-    return ImGui::GetItemRectSize();
+    *pOut = ImGui::GetItemRectSize();
 }
 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);
 }
@@ -1304,9 +1304,9 @@ CIMGUI_API ImGuiStorage* igGetStateStorage()
 {
     return ImGui::GetStateStorage();
 }
-CIMGUI_API ImVec2 igCalcTextSize(const char* text,const char* text_end,bool hide_text_after_double_hash,float wrap_width)
+CIMGUI_API void igCalcTextSize(ImVec2 *pOut,const char* text,const char* text_end,bool hide_text_after_double_hash,float wrap_width)
 {
-    return ImGui::CalcTextSize(text,text_end,hide_text_after_double_hash,wrap_width);
+    *pOut = ImGui::CalcTextSize(text,text_end,hide_text_after_double_hash,wrap_width);
 }
 CIMGUI_API void igCalcListClipping(int items_count,float items_height,int* out_items_display_start,int* out_items_display_end)
 {
@@ -1320,9 +1320,9 @@ CIMGUI_API void igEndChildFrame()
 {
     return ImGui::EndChildFrame();
 }
-CIMGUI_API ImVec4 igColorConvertU32ToFloat4(ImU32 in)
+CIMGUI_API void igColorConvertU32ToFloat4(ImVec4 *pOut,ImU32 in)
 {
-    return ImGui::ColorConvertU32ToFloat4(in);
+    *pOut = ImGui::ColorConvertU32ToFloat4(in);
 }
 CIMGUI_API ImU32 igColorConvertFloat4ToU32(const ImVec4 in)
 {
@@ -1380,21 +1380,21 @@ CIMGUI_API bool igIsAnyMouseDown()
 {
     return ImGui::IsAnyMouseDown();
 }
-CIMGUI_API ImVec2 igGetMousePos()
+CIMGUI_API void igGetMousePos(ImVec2 *pOut)
 {
-    return ImGui::GetMousePos();
+    *pOut = ImGui::GetMousePos();
 }
-CIMGUI_API ImVec2 igGetMousePosOnOpeningCurrentPopup()
+CIMGUI_API void igGetMousePosOnOpeningCurrentPopup(ImVec2 *pOut)
 {
-    return ImGui::GetMousePosOnOpeningCurrentPopup();
+    *pOut = ImGui::GetMousePosOnOpeningCurrentPopup();
 }
 CIMGUI_API bool igIsMouseDragging(ImGuiMouseButton button,float lock_threshold)
 {
     return ImGui::IsMouseDragging(button,lock_threshold);
 }
-CIMGUI_API ImVec2 igGetMouseDragDelta(ImGuiMouseButton button,float lock_threshold)
+CIMGUI_API void igGetMouseDragDelta(ImVec2 *pOut,ImGuiMouseButton button,float lock_threshold)
 {
-    return ImGui::GetMouseDragDelta(button,lock_threshold);
+    *pOut = ImGui::GetMouseDragDelta(button,lock_threshold);
 }
 CIMGUI_API void igResetMouseDragDelta(ImGuiMouseButton button)
 {
@@ -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)();
 }
@@ -1748,9 +1748,9 @@ CIMGUI_API void ImColor_SetHSV(ImColor* self,float h,float s,float v,float a)
 {
     return self->SetHSV(h,s,v,a);
 }
-CIMGUI_API ImColor ImColor_HSV(ImColor* self,float h,float s,float v,float a)
+CIMGUI_API void ImColor_HSV(ImColor *pOut,ImColor* self,float h,float s,float v,float a)
 {
-    return self->HSV(h,s,v,a);
+    *pOut = self->HSV(h,s,v,a);
 }
 CIMGUI_API ImDrawCmd* ImDrawCmd_ImDrawCmd(void)
 {
@@ -1816,13 +1816,13 @@ CIMGUI_API void ImDrawList_PopTextureID(ImDrawList* self)
 {
     return self->PopTextureID();
 }
-CIMGUI_API ImVec2 ImDrawList_GetClipRectMin(ImDrawList* self)
+CIMGUI_API void ImDrawList_GetClipRectMin(ImVec2 *pOut,ImDrawList* self)
 {
-    return self->GetClipRectMin();
+    *pOut = self->GetClipRectMin();
 }
-CIMGUI_API ImVec2 ImDrawList_GetClipRectMax(ImDrawList* self)
+CIMGUI_API void ImDrawList_GetClipRectMax(ImVec2 *pOut,ImDrawList* self)
 {
-    return self->GetClipRectMax();
+    *pOut = self->GetClipRectMax();
 }
 CIMGUI_API void ImDrawList_AddLine(ImDrawList* self,const ImVec2 p1,const ImVec2 p2,ImU32 col,float thickness)
 {
@@ -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);
 }
@@ -2236,9 +2236,9 @@ CIMGUI_API const char* ImFont_GetDebugName(ImFont* self)
 {
     return self->GetDebugName();
 }
-CIMGUI_API ImVec2 ImFont_CalcTextSizeA(ImFont* self,float size,float max_width,float wrap_width,const char* text_begin,const char* text_end,const char** remaining)
+CIMGUI_API void ImFont_CalcTextSizeA(ImVec2 *pOut,ImFont* self,float size,float max_width,float wrap_width,const char* text_begin,const char* text_end,const char** remaining)
 {
-    return self->CalcTextSizeA(size,max_width,wrap_width,text_begin,text_end,remaining);
+    *pOut = self->CalcTextSizeA(size,max_width,wrap_width,text_begin,text_end,remaining);
 }
 CIMGUI_API const char* ImFont_CalcWordWrapPositionA(ImFont* self,float scale,const char* text,const char* text_end,float wrap_width)
 {
@@ -2276,226 +2276,6 @@ CIMGUI_API void ImFont_SetFallbackChar(ImFont* self,ImWchar c)
 {
     return self->SetFallbackChar(c);
 }
-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;
-}
 
 
 

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
@@ -927,10 +900,10 @@ typedef ImVector<ImVec4> ImVector_ImVec4;
 typedef ImVector<ImDrawIdx> ImVector_ImDrawIdx;
 typedef ImVector<ImVec2> 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);
@@ -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);
@@ -965,8 +938,8 @@ CIMGUI_API bool igIsWindowCollapsed(void);
 CIMGUI_API bool igIsWindowFocused(ImGuiFocusedFlags flags);
 CIMGUI_API bool igIsWindowHovered(ImGuiHoveredFlags flags);
 CIMGUI_API ImDrawList* igGetWindowDrawList(void);
-CIMGUI_API ImVec2 igGetWindowPos(void);
-CIMGUI_API ImVec2 igGetWindowSize(void);
+CIMGUI_API void igGetWindowPos(ImVec2 *pOut);
+CIMGUI_API void igGetWindowSize(ImVec2 *pOut);
 CIMGUI_API float igGetWindowWidth(void);
 CIMGUI_API float igGetWindowHeight(void);
 CIMGUI_API void igSetNextWindowPos(const ImVec2 pos,ImGuiCond cond,const ImVec2 pivot);
@@ -979,16 +952,16 @@ 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);
 CIMGUI_API void igSetWindowCollapsedStr(const char* name,bool collapsed,ImGuiCond cond);
 CIMGUI_API void igSetWindowFocusStr(const char* name);
-CIMGUI_API ImVec2 igGetContentRegionMax(void);
-CIMGUI_API ImVec2 igGetContentRegionAvail(void);
-CIMGUI_API ImVec2 igGetWindowContentRegionMin(void);
-CIMGUI_API ImVec2 igGetWindowContentRegionMax(void);
+CIMGUI_API void igGetContentRegionMax(ImVec2 *pOut);
+CIMGUI_API void igGetContentRegionAvail(ImVec2 *pOut);
+CIMGUI_API void igGetWindowContentRegionMin(ImVec2 *pOut);
+CIMGUI_API void igGetWindowContentRegionMax(ImVec2 *pOut);
 CIMGUI_API float igGetWindowContentRegionWidth(void);
 CIMGUI_API float igGetScrollX(void);
 CIMGUI_API float igGetScrollY(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);
@@ -1011,8 +984,8 @@ CIMGUI_API void igPopStyleVar(int count);
 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 void igGetFontTexUvWhitePixel(ImVec2 *pOut);
+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);
@@ -1034,14 +1007,14 @@ CIMGUI_API void igIndent(float indent_w);
 CIMGUI_API void igUnindent(float indent_w);
 CIMGUI_API void igBeginGroup(void);
 CIMGUI_API void igEndGroup(void);
-CIMGUI_API ImVec2 igGetCursorPos(void);
+CIMGUI_API void igGetCursorPos(ImVec2 *pOut);
 CIMGUI_API float igGetCursorPosX(void);
 CIMGUI_API float igGetCursorPosY(void);
 CIMGUI_API void igSetCursorPos(const ImVec2 local_pos);
 CIMGUI_API void igSetCursorPosX(float local_x);
 CIMGUI_API void igSetCursorPosY(float local_y);
-CIMGUI_API ImVec2 igGetCursorStartPos(void);
-CIMGUI_API ImVec2 igGetCursorScreenPos(void);
+CIMGUI_API void igGetCursorStartPos(ImVec2 *pOut);
+CIMGUI_API void igGetCursorScreenPos(ImVec2 *pOut);
 CIMGUI_API void igSetCursorScreenPos(const ImVec2 pos);
 CIMGUI_API void igAlignTextToFramePadding(void);
 CIMGUI_API float igGetTextLineHeight(void);
@@ -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);
@@ -1228,11 +1201,11 @@ CIMGUI_API bool igIsItemToggledOpen(void);
 CIMGUI_API bool igIsAnyItemHovered(void);
 CIMGUI_API bool igIsAnyItemActive(void);
 CIMGUI_API bool igIsAnyItemFocused(void);
-CIMGUI_API ImVec2 igGetItemRectMin(void);
-CIMGUI_API ImVec2 igGetItemRectMax(void);
-CIMGUI_API ImVec2 igGetItemRectSize(void);
+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);
@@ -1242,11 +1215,11 @@ CIMGUI_API ImDrawListSharedData* igGetDrawListSharedData(void);
 CIMGUI_API const char* igGetStyleColorName(ImGuiCol idx);
 CIMGUI_API void igSetStateStorage(ImGuiStorage* storage);
 CIMGUI_API ImGuiStorage* igGetStateStorage(void);
-CIMGUI_API ImVec2 igCalcTextSize(const char* text,const char* text_end,bool hide_text_after_double_hash,float wrap_width);
+CIMGUI_API void igCalcTextSize(ImVec2 *pOut,const char* text,const char* text_end,bool hide_text_after_double_hash,float wrap_width);
 CIMGUI_API void igCalcListClipping(int items_count,float items_height,int* out_items_display_start,int* out_items_display_end);
 CIMGUI_API bool igBeginChildFrame(ImGuiID id,const ImVec2 size,ImGuiWindowFlags flags);
 CIMGUI_API void igEndChildFrame(void);
-CIMGUI_API ImVec4 igColorConvertU32ToFloat4(ImU32 in);
+CIMGUI_API void igColorConvertU32ToFloat4(ImVec4 *pOut,ImU32 in);
 CIMGUI_API ImU32 igColorConvertFloat4ToU32(const ImVec4 in);
 CIMGUI_API int igGetKeyIndex(ImGuiKey imgui_key);
 CIMGUI_API bool igIsKeyDown(int user_key_index);
@@ -1261,10 +1234,10 @@ CIMGUI_API bool igIsMouseDoubleClicked(ImGuiMouseButton button);
 CIMGUI_API bool igIsMouseHoveringRect(const ImVec2 r_min,const ImVec2 r_max,bool clip);
 CIMGUI_API bool igIsMousePosValid(const ImVec2* mouse_pos);
 CIMGUI_API bool igIsAnyMouseDown(void);
-CIMGUI_API ImVec2 igGetMousePos(void);
-CIMGUI_API ImVec2 igGetMousePosOnOpeningCurrentPopup(void);
+CIMGUI_API void igGetMousePos(ImVec2 *pOut);
+CIMGUI_API void igGetMousePosOnOpeningCurrentPopup(ImVec2 *pOut);
 CIMGUI_API bool igIsMouseDragging(ImGuiMouseButton button,float lock_threshold);
-CIMGUI_API ImVec2 igGetMouseDragDelta(ImGuiMouseButton button,float lock_threshold);
+CIMGUI_API void igGetMouseDragDelta(ImVec2 *pOut,ImGuiMouseButton button,float lock_threshold);
 CIMGUI_API void igResetMouseDragDelta(ImGuiMouseButton button);
 CIMGUI_API ImGuiMouseCursor igGetMouseCursor(void);
 CIMGUI_API void igSetMouseCursor(ImGuiMouseCursor cursor_type);
@@ -1306,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);
@@ -1346,14 +1319,14 @@ 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);
 CIMGUI_API ImColor* ImColor_ImColorFloat(float r,float g,float b,float a);
 CIMGUI_API ImColor* ImColor_ImColorVec4(const ImVec4 col);
 CIMGUI_API void ImColor_SetHSV(ImColor* self,float h,float s,float v,float a);
-CIMGUI_API ImColor ImColor_HSV(ImColor* self,float h,float s,float v,float a);
+CIMGUI_API void ImColor_HSV(ImColor *pOut,ImColor* self,float h,float s,float v,float a);
 CIMGUI_API ImDrawCmd* ImDrawCmd_ImDrawCmd(void);
 CIMGUI_API void ImDrawCmd_destroy(ImDrawCmd* self);
 CIMGUI_API ImDrawListSplitter* ImDrawListSplitter_ImDrawListSplitter(void);
@@ -1370,8 +1343,8 @@ CIMGUI_API void ImDrawList_PushClipRectFullScreen(ImDrawList* self);
 CIMGUI_API void ImDrawList_PopClipRect(ImDrawList* self);
 CIMGUI_API void ImDrawList_PushTextureID(ImDrawList* self,ImTextureID texture_id);
 CIMGUI_API void ImDrawList_PopTextureID(ImDrawList* self);
-CIMGUI_API ImVec2 ImDrawList_GetClipRectMin(ImDrawList* self);
-CIMGUI_API ImVec2 ImDrawList_GetClipRectMax(ImDrawList* self);
+CIMGUI_API void ImDrawList_GetClipRectMin(ImVec2 *pOut,ImDrawList* self);
+CIMGUI_API void ImDrawList_GetClipRectMax(ImVec2 *pOut,ImDrawList* self);
 CIMGUI_API void ImDrawList_AddLine(ImDrawList* self,const ImVec2 p1,const ImVec2 p2,ImU32 col,float thickness);
 CIMGUI_API void ImDrawList_AddRect(ImDrawList* self,const ImVec2 p_min,const ImVec2 p_max,ImU32 col,float rounding,ImDrawCornerFlags rounding_corners,float thickness);
 CIMGUI_API void ImDrawList_AddRectFilled(ImDrawList* self,const ImVec2 p_min,const ImVec2 p_max,ImU32 col,float rounding,ImDrawCornerFlags rounding_corners);
@@ -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);
@@ -1475,7 +1448,7 @@ CIMGUI_API const ImFontGlyph* ImFont_FindGlyphNoFallback(ImFont* self,ImWchar c)
 CIMGUI_API float ImFont_GetCharAdvance(ImFont* self,ImWchar c);
 CIMGUI_API bool ImFont_IsLoaded(ImFont* self);
 CIMGUI_API const char* ImFont_GetDebugName(ImFont* self);
-CIMGUI_API ImVec2 ImFont_CalcTextSizeA(ImFont* self,float size,float max_width,float wrap_width,const char* text_begin,const char* text_end,const char** remaining);
+CIMGUI_API void ImFont_CalcTextSizeA(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 const char* ImFont_CalcWordWrapPositionA(ImFont* self,float scale,const char* text,const char* text_end,float wrap_width);
 CIMGUI_API void ImFont_RenderChar(ImFont* self,ImDrawList* draw_list,float size,ImVec2 pos,ImU32 col,ImWchar c);
 CIMGUI_API void ImFont_RenderText(ImFont* self,ImDrawList* draw_list,float size,ImVec2 pos,ImU32 col,const ImVec4 clip_rect,const char* text_begin,const char* text_end,float wrap_width,bool cpu_fine_clip);
@@ -1485,50 +1458,6 @@ CIMGUI_API void ImFont_GrowIndex(ImFont* self,int new_size);
 CIMGUI_API void ImFont_AddGlyph(ImFont* self,ImWchar c,float x0,float y0,float x1,float y1,float u0,float v0,float u1,float v1,float advance_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

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,33 +11,33 @@ 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)
 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,39 +49,39 @@ 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*)
+1	T*	ImVector_eraseNil (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)
 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)
 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)
@@ -89,35 +89,35 @@ 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	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
-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)
 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 ()
+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)