Merge pull request #74 from sonoro1234/ImVector_templates

add ImVector template types
2025-08-10 20:08:31 +01:00 · 2018-10-18 13:07:28 +02:00 · 2018-10-18 13:05:57 +02:00 · 2018-10-18 09:34:33 +02:00 · 2018-10-17 20:11:39 +02:00 · 2018-10-17 20:08:40 +02:00
11 changed files with 853 additions and 171 deletions
--- a/README.md
+++ b/README.md
@@ -57,6 +57,7 @@ Notes:
    * calc_value : the numeric value corresponding to value
  * under key structs we get the structs collection in which the key is the struct name and the value is an array of the struct members. Each one given as a collection with keys
    * type : the type of the struct member
+    * template_type : if type has a template argument (as ImVector) here will be
    * name : the name of the struct member
 # usage

--- a/cimgui.cpp
+++ b/cimgui.cpp
@@ -5,6 +5,30 @@

 #include "./imgui/imgui_internal.h"

+CIMGUI_API ImVec2* ImVec2_ImVec2(void)
+{
+    return IM_NEW(ImVec2)();
+}
+CIMGUI_API void ImVec2_destroy(ImVec2* self)
+{
+    IM_DELETE(self);
+}
+CIMGUI_API ImVec2* ImVec2_ImVec2Float(float _x,float _y)
+{
+    return IM_NEW(ImVec2)(_x,_y);
+}
+CIMGUI_API ImVec4* ImVec4_ImVec4(void)
+{
+    return IM_NEW(ImVec4)();
+}
+CIMGUI_API void ImVec4_destroy(ImVec4* self)
+{
+    IM_DELETE(self);
+}
+CIMGUI_API ImVec4* ImVec4_ImVec4Float(float _x,float _y,float _z,float _w)
+{
+    return IM_NEW(ImVec4)(_x,_y,_z,_w);
+}
 CIMGUI_API ImGuiContext* igCreateContext(ImFontAtlas* shared_font_atlas)
 {
    return ImGui::CreateContext(shared_font_atlas);
@@ -1374,6 +1398,14 @@ CIMGUI_API void igMemFree(void* ptr)
 {
    return ImGui::MemFree(ptr);
 }
+CIMGUI_API ImGuiStyle* ImGuiStyle_ImGuiStyle(void)
+{
+    return IM_NEW(ImGuiStyle)();
+}
+CIMGUI_API void ImGuiStyle_destroy(ImGuiStyle* self)
+{
+    IM_DELETE(self);
+}
 CIMGUI_API void ImGuiStyle_ScaleAllSizes(ImGuiStyle* self,float scale_factor)
 {
    return self->ScaleAllSizes(scale_factor);
@@ -1390,6 +1422,26 @@ CIMGUI_API void ImGuiIO_ClearInputCharacters(ImGuiIO* self)
 {
    return self->ClearInputCharacters();
 }
+CIMGUI_API ImGuiIO* ImGuiIO_ImGuiIO(void)
+{
+    return IM_NEW(ImGuiIO)();
+}
+CIMGUI_API void ImGuiIO_destroy(ImGuiIO* self)
+{
+    IM_DELETE(self);
+}
+CIMGUI_API ImGuiOnceUponAFrame* ImGuiOnceUponAFrame_ImGuiOnceUponAFrame(void)
+{
+    return IM_NEW(ImGuiOnceUponAFrame)();
+}
+CIMGUI_API void ImGuiOnceUponAFrame_destroy(ImGuiOnceUponAFrame* self)
+{
+    IM_DELETE(self);
+}
+CIMGUI_API ImGuiTextFilter* ImGuiTextFilter_ImGuiTextFilter(const char* default_filter)
+{
+    return IM_NEW(ImGuiTextFilter)(default_filter);
+}
 CIMGUI_API bool ImGuiTextFilter_Draw(ImGuiTextFilter* self,const char* label,float width)
 {
    return self->Draw(label,width);
@@ -1410,6 +1462,18 @@ CIMGUI_API bool ImGuiTextFilter_IsActive(ImGuiTextFilter* self)
 {
    return self->IsActive();
 }
+CIMGUI_API TextRange* TextRange_TextRange(void)
+{
+    return IM_NEW(TextRange)();
+}
+CIMGUI_API void TextRange_destroy(TextRange* self)
+{
+    IM_DELETE(self);
+}
+CIMGUI_API TextRange* TextRange_TextRangeStr(const char* _b,const char* _e)
+{
+    return IM_NEW(TextRange)(_b,_e);
+}
 CIMGUI_API const char* TextRange_begin(TextRange* self)
 {
    return self->begin();
@@ -1426,6 +1490,14 @@ CIMGUI_API void TextRange_split(TextRange* self,char separator,ImVector_TextRang
 {
    return self->split(separator,out);
 }
+CIMGUI_API ImGuiTextBuffer* ImGuiTextBuffer_ImGuiTextBuffer(void)
+{
+    return IM_NEW(ImGuiTextBuffer)();
+}
+CIMGUI_API void ImGuiTextBuffer_destroy(ImGuiTextBuffer* self)
+{
+    IM_DELETE(self);
+}
 CIMGUI_API const char* ImGuiTextBuffer_begin(ImGuiTextBuffer* self)
 {
    return self->begin();
@@ -1458,6 +1530,18 @@ CIMGUI_API void ImGuiTextBuffer_appendfv(ImGuiTextBuffer* self,const char* fmt,v
 {
    return self->appendfv(fmt,args);
 }
+CIMGUI_API Pair* Pair_PairInt(ImGuiID _key,int _val_i)
+{
+    return IM_NEW(Pair)(_key,_val_i);
+}
+CIMGUI_API Pair* Pair_PairFloat(ImGuiID _key,float _val_f)
+{
+    return IM_NEW(Pair)(_key,_val_f);
+}
+CIMGUI_API Pair* Pair_PairPtr(ImGuiID _key,void* _val_p)
+{
+    return IM_NEW(Pair)(_key,_val_p);
+}
 CIMGUI_API void ImGuiStorage_Clear(ImGuiStorage* self)
 {
    return self->Clear();
@@ -1518,6 +1602,14 @@ CIMGUI_API void ImGuiStorage_BuildSortByKey(ImGuiStorage* self)
 {
    return self->BuildSortByKey();
 }
+CIMGUI_API ImGuiInputTextCallbackData* ImGuiInputTextCallbackData_ImGuiInputTextCallbackData(void)
+{
+    return IM_NEW(ImGuiInputTextCallbackData)();
+}
+CIMGUI_API void ImGuiInputTextCallbackData_destroy(ImGuiInputTextCallbackData* self)
+{
+    IM_DELETE(self);
+}
 CIMGUI_API void ImGuiInputTextCallbackData_DeleteChars(ImGuiInputTextCallbackData* self,int pos,int bytes_count)
 {
    return self->DeleteChars(pos,bytes_count);
@@ -1530,6 +1622,14 @@ CIMGUI_API bool ImGuiInputTextCallbackData_HasSelection(ImGuiInputTextCallbackDa
 {
    return self->HasSelection();
 }
+CIMGUI_API ImGuiPayload* ImGuiPayload_ImGuiPayload(void)
+{
+    return IM_NEW(ImGuiPayload)();
+}
+CIMGUI_API void ImGuiPayload_destroy(ImGuiPayload* self)
+{
+    IM_DELETE(self);
+}
 CIMGUI_API void ImGuiPayload_Clear(ImGuiPayload* self)
 {
    return self->Clear();
@@ -1546,6 +1646,30 @@ CIMGUI_API bool ImGuiPayload_IsDelivery(ImGuiPayload* self)
 {
    return self->IsDelivery();
 }
+CIMGUI_API ImColor* ImColor_ImColor(void)
+{
+    return IM_NEW(ImColor)();
+}
+CIMGUI_API void ImColor_destroy(ImColor* self)
+{
+    IM_DELETE(self);
+}
+CIMGUI_API ImColor* ImColor_ImColorInt(int r,int g,int b,int a)
+{
+    return IM_NEW(ImColor)(r,g,b,a);
+}
+CIMGUI_API ImColor* ImColor_ImColorU32(ImU32 rgba)
+{
+    return IM_NEW(ImColor)(rgba);
+}
+CIMGUI_API ImColor* ImColor_ImColorFloat(float r,float g,float b,float a)
+{
+    return IM_NEW(ImColor)(r,g,b,a);
+}
+CIMGUI_API ImColor* ImColor_ImColorVec4(const ImVec4 col)
+{
+    return IM_NEW(ImColor)(col);
+}
 CIMGUI_API void ImColor_SetHSV(ImColor* self,float h,float s,float v,float a)
 {
    return self->SetHSV(h,s,v,a);
@@ -1554,6 +1678,10 @@ CIMGUI_API ImColor ImColor_HSV(ImColor* self,float h,float s,float v,float a)
 {
    return self->HSV(h,s,v,a);
 }
+CIMGUI_API ImGuiListClipper* ImGuiListClipper_ImGuiListClipper(int items_count,float items_height)
+{
+    return IM_NEW(ImGuiListClipper)(items_count,items_height);
+}
 CIMGUI_API bool ImGuiListClipper_Step(ImGuiListClipper* self)
 {
    return self->Step();
@@ -1566,6 +1694,18 @@ CIMGUI_API void ImGuiListClipper_End(ImGuiListClipper* self)
 {
    return self->End();
 }
+CIMGUI_API ImDrawCmd* ImDrawCmd_ImDrawCmd(void)
+{
+    return IM_NEW(ImDrawCmd)();
+}
+CIMGUI_API void ImDrawCmd_destroy(ImDrawCmd* self)
+{
+    IM_DELETE(self);
+}
+CIMGUI_API ImDrawList* ImDrawList_ImDrawList(const ImDrawListSharedData* shared_data)
+{
+    return IM_NEW(ImDrawList)(shared_data);
+}
 CIMGUI_API void ImDrawList_PushClipRect(ImDrawList* self,ImVec2 clip_rect_min,ImVec2 clip_rect_max,bool intersect_with_current_clip_rect)
 {
    return self->PushClipRect(clip_rect_min,clip_rect_max,intersect_with_current_clip_rect);
@@ -1770,6 +1910,14 @@ CIMGUI_API void ImDrawList_UpdateTextureID(ImDrawList* self)
 {
    return self->UpdateTextureID();
 }
+CIMGUI_API ImDrawData* ImDrawData_ImDrawData(void)
+{
+    return IM_NEW(ImDrawData)();
+}
+CIMGUI_API void ImDrawData_destroy(ImDrawData* self)
+{
+    IM_DELETE(self);
+}
 CIMGUI_API void ImDrawData_Clear(ImDrawData* self)
 {
    return self->Clear();
@@ -1782,6 +1930,22 @@ CIMGUI_API void ImDrawData_ScaleClipRects(ImDrawData* self,const ImVec2 sc)
 {
    return self->ScaleClipRects(sc);
 }
+CIMGUI_API ImFontConfig* ImFontConfig_ImFontConfig(void)
+{
+    return IM_NEW(ImFontConfig)();
+}
+CIMGUI_API void ImFontConfig_destroy(ImFontConfig* self)
+{
+    IM_DELETE(self);
+}
+CIMGUI_API ImFontAtlas* ImFontAtlas_ImFontAtlas(void)
+{
+    return IM_NEW(ImFontAtlas)();
+}
+CIMGUI_API void ImFontAtlas_destroy(ImFontAtlas* self)
+{
+    IM_DELETE(self);
+}
 CIMGUI_API ImFont* ImFontAtlas_AddFont(ImFontAtlas* self,const ImFontConfig* font_cfg)
 {
    return self->AddFont(font_cfg);
@@ -1870,6 +2034,14 @@ CIMGUI_API const ImWchar* ImFontAtlas_GetGlyphRangesThai(ImFontAtlas* self)
 {
    return self->GetGlyphRangesThai();
 }
+CIMGUI_API GlyphRangesBuilder* GlyphRangesBuilder_GlyphRangesBuilder(void)
+{
+    return IM_NEW(GlyphRangesBuilder)();
+}
+CIMGUI_API void GlyphRangesBuilder_destroy(GlyphRangesBuilder* self)
+{
+    IM_DELETE(self);
+}
 CIMGUI_API bool GlyphRangesBuilder_GetBit(GlyphRangesBuilder* self,int n)
 {
    return self->GetBit(n);
@@ -1894,6 +2066,14 @@ CIMGUI_API void GlyphRangesBuilder_BuildRanges(GlyphRangesBuilder* self,ImVector
 {
    return self->BuildRanges(out_ranges);
 }
+CIMGUI_API CustomRect* CustomRect_CustomRect(void)
+{
+    return IM_NEW(CustomRect)();
+}
+CIMGUI_API void CustomRect_destroy(CustomRect* self)
+{
+    IM_DELETE(self);
+}
 CIMGUI_API bool CustomRect_IsPacked(CustomRect* self)
 {
    return self->IsPacked();
@@ -1918,6 +2098,14 @@ CIMGUI_API bool ImFontAtlas_GetMouseCursorTexData(ImFontAtlas* self,ImGuiMouseCu
 {
    return self->GetMouseCursorTexData(cursor,out_offset,out_size,out_uv_border,out_uv_fill);
 }
+CIMGUI_API ImFont* ImFont_ImFont(void)
+{
+    return IM_NEW(ImFont)();
+}
+CIMGUI_API void ImFont_destroy(ImFont* self)
+{
+    IM_DELETE(self);
+}
 CIMGUI_API void ImFont_ClearOutputData(ImFont* self)
 {
    return self->ClearOutputData();
@@ -2219,10 +2407,7 @@ CIMGUI_API void ImGuiTextBuffer_appendf(struct ImGuiTextBuffer *buffer, const ch
    buffer->appendfv(fmt, args);
    va_end(args);
 }
-CIMGUI_API void ImFontConfig_DefaultConstructor(ImFontConfig *config)
-{
-    *config = ImFontConfig();
-}
+
 CIMGUI_API float igGET_FLT_MAX()
 {
    return FLT_MAX;
@@ -2235,3 +2420,21 @@ CIMGUI_API void igColorConvertHSVtoRGB(float h,float s,float v,float *out_r,floa
 {
    ImGui::ColorConvertHSVtoRGB(h,s,v,*out_r,*out_g,*out_b);
 }
+
+CIMGUI_API ImVector_ImWchar* ImVector_ImWchar_create()
+{
+	return IM_NEW(ImVector<ImWchar>) ();
+}
+CIMGUI_API void ImVector_ImWchar_destroy(ImVector_ImWchar* p)
+{
+	IM_DELETE(p);
+}
+CIMGUI_API void ImVector_ImWchar_Init(ImVector_ImWchar* p)
+{
+	IM_PLACEMENT_NEW(p) ImVector<ImWchar>();
+}
+CIMGUI_API void ImVector_ImWchar_UnInit(ImVector_ImWchar* p)
+{
+	p->~ImVector<ImWchar>();
+}
+
--- a/cimgui.h
+++ b/cimgui.h
@@ -1,7 +1,7 @@
 //This file is automatically generated by generator.lua from https://github.com/cimgui/cimgui
 //based on imgui.h file version "1.65" from Dear ImGui https://github.com/ocornut/imgui
 #include <stdio.h>
-
+#include <stdint.h>
 #if defined _WIN32 || defined __CYGWIN__
    #ifdef CIMGUI_NO_EXPORT
        #define API
@@ -40,12 +40,30 @@ typedef struct ImColor_Simple { ImVec4_Simple Value;} ImColor_Simple;


 #ifdef CIMGUI_DEFINE_ENUMS_AND_STRUCTS
-struct ImDrawChannel;
 typedef struct CustomRect CustomRect;
 typedef struct GlyphRangesBuilder GlyphRangesBuilder;
 typedef struct ImFontGlyph ImFontGlyph;
+typedef unsigned short ImDrawIdx;;
 typedef struct Pair Pair;
 typedef struct TextRange TextRange;
+typedef struct ImVector_ImVec2 ImVector_ImVec2;
+typedef struct ImVector_ImDrawIdx ImVector_ImDrawIdx;
+typedef struct ImVector_ImVec4 ImVector_ImVec4;
+typedef struct ImVector_TextRange ImVector_TextRange;
+typedef struct ImVector_ImFontPtr ImVector_ImFontPtr;
+typedef struct ImVector_ImDrawCmd ImVector_ImDrawCmd;
+typedef struct ImVector_ImDrawVert ImVector_ImDrawVert;
+typedef struct ImVector_unsigned_short ImVector_unsigned_short;
+typedef struct ImVector_ImTextureID ImVector_ImTextureID;
+typedef struct ImVector_char ImVector_char;
+typedef struct ImVector_ImDrawChannel ImVector_ImDrawChannel;
+typedef struct ImVector_CustomRect ImVector_CustomRect;
+typedef struct ImVector_Pair ImVector_Pair;
+typedef struct ImVector_unsigned_char ImVector_unsigned_char;
+typedef struct ImVector_ImFontGlyph ImVector_ImFontGlyph;
+typedef struct ImVector_ImFontConfig ImVector_ImFontConfig;
+typedef struct ImVector_ImWchar ImVector_ImWchar;
+typedef struct ImVector_float ImVector_float;
 typedef struct ImVec4 ImVec4;
 typedef struct ImVec2 ImVec2;
 typedef struct ImGuiTextBuffer ImGuiTextBuffer;
@@ -69,6 +87,7 @@ typedef struct ImDrawList ImDrawList;
 typedef struct ImDrawData ImDrawData;
 typedef struct ImDrawCmd ImDrawCmd;
 typedef struct ImDrawChannel ImDrawChannel;
+struct ImDrawChannel;
 struct ImDrawCmd;
 struct ImDrawData;
 struct ImDrawList;
@@ -568,13 +587,25 @@ struct ImGuiIO
    float NavInputsDownDuration[ImGuiNavInput_COUNT];
    float NavInputsDownDurationPrev[ImGuiNavInput_COUNT];
 };
-struct ImVector
-{
-    int Size;
-    int Capacity;
-    void* Data;
-};
-typedef struct ImVector ImVector;
+typedef struct ImVector{int Size;int Capacity;void* Data;} ImVector;
+struct ImVector_float {int Size;int Capacity;float* Data;} ImVector_float;
+struct ImVector_ImWchar {int Size;int Capacity;ImWchar* Data;} ImVector_ImWchar;
+struct ImVector_ImFontConfig {int Size;int Capacity;ImFontConfig* Data;} ImVector_ImFontConfig;
+struct ImVector_ImFontGlyph {int Size;int Capacity;ImFontGlyph* Data;} ImVector_ImFontGlyph;
+struct ImVector_unsigned_char {int Size;int Capacity;unsigned char* Data;} ImVector_unsigned_char;
+struct ImVector_Pair {int Size;int Capacity;Pair* Data;} ImVector_Pair;
+struct ImVector_CustomRect {int Size;int Capacity;CustomRect* Data;} ImVector_CustomRect;
+struct ImVector_ImDrawChannel {int Size;int Capacity;ImDrawChannel* Data;} ImVector_ImDrawChannel;
+struct ImVector_char {int Size;int Capacity;char* Data;} ImVector_char;
+struct ImVector_ImTextureID {int Size;int Capacity;ImTextureID* Data;} ImVector_ImTextureID;
+struct ImVector_unsigned_short {int Size;int Capacity;unsigned short* Data;} ImVector_unsigned_short;
+struct ImVector_ImDrawVert {int Size;int Capacity;ImDrawVert* Data;} ImVector_ImDrawVert;
+struct ImVector_ImDrawCmd {int Size;int Capacity;ImDrawCmd* Data;} ImVector_ImDrawCmd;
+struct ImVector_ImFontPtr {int Size;int Capacity;ImFont** Data;} ImVector_ImFontPtr;
+struct ImVector_TextRange {int Size;int Capacity;TextRange* Data;} ImVector_TextRange;
+struct ImVector_ImVec4 {int Size;int Capacity;ImVec4* Data;} ImVector_ImVec4;
+struct ImVector_ImDrawIdx {int Size;int Capacity;ImDrawIdx* Data;} ImVector_ImDrawIdx;
+struct ImVector_ImVec2 {int Size;int Capacity;ImVec2* Data;} ImVector_ImVec2;
 struct ImNewDummy {};
 struct ImGuiOnceUponAFrame
 {
@@ -583,16 +614,16 @@ struct ImGuiOnceUponAFrame
 struct ImGuiTextFilter
 {
    char InputBuf[256];
-    ImVector/*<TextRange>*/ Filters;
+    ImVector_TextRange Filters;
    int CountGrep;
 };
 struct ImGuiTextBuffer
 {
-    ImVector/*<char>*/ Buf;
+    ImVector_char Buf;
 };
 struct ImGuiStorage
 {
-    ImVector/*<Pair>*/ Data;
+    ImVector_Pair Data;
 };
 struct ImGuiInputTextCallbackData
 {
@@ -646,7 +677,6 @@ struct ImDrawCmd
    ImDrawCallback UserCallback;
    void* UserCallbackData;
 };
-typedef unsigned short ImDrawIdx;
 struct ImDrawVert
 {
    ImVec2 pos;
@@ -655,8 +685,8 @@ struct ImDrawVert
 };
 struct ImDrawChannel
 {
-    ImVector/*<ImDrawCmd>*/ CmdBuffer;
-    ImVector/*<ImDrawIdx>*/ IdxBuffer;
+    ImVector_ImDrawCmd CmdBuffer;
+    ImVector_ImDrawIdx IdxBuffer;
 };
 enum ImDrawCornerFlags_
 {
@@ -677,21 +707,21 @@ enum ImDrawListFlags_
 };
 struct ImDrawList
 {
-    ImVector/*<ImDrawCmd>*/ CmdBuffer;
-    ImVector/*<ImDrawIdx>*/ IdxBuffer;
-    ImVector/*<ImDrawVert>*/ VtxBuffer;
+    ImVector_ImDrawCmd CmdBuffer;
+    ImVector_ImDrawIdx IdxBuffer;
+    ImVector_ImDrawVert VtxBuffer;
    ImDrawListFlags Flags;
    const ImDrawListSharedData* _Data;
    const char* _OwnerName;
    unsigned int _VtxCurrentIdx;
    ImDrawVert* _VtxWritePtr;
    ImDrawIdx* _IdxWritePtr;
-    ImVector/*<ImVec4>*/ _ClipRectStack;
-    ImVector/*<ImTextureID>*/ _TextureIdStack;
-    ImVector/*<ImVec2>*/ _Path;
+    ImVector_ImVec4 _ClipRectStack;
+    ImVector_ImTextureID _TextureIdStack;
+    ImVector_ImVec2 _Path;
    int _ChannelsCurrent;
    int _ChannelsCount;
-    ImVector/*<ImDrawChannel>*/ _Channels;
+    ImVector_ImDrawChannel _Channels;
 };
 struct ImDrawData
 {
@@ -750,9 +780,9 @@ struct ImFontAtlas
    int TexHeight;
    ImVec2 TexUvScale;
    ImVec2 TexUvWhitePixel;
-    ImVector/*<ImFont*>*/ Fonts;
-    ImVector/*<CustomRect>*/ CustomRects;
-    ImVector/*<ImFontConfig>*/ ConfigData;
+    ImVector_ImFontPtr Fonts;
+    ImVector_CustomRect CustomRects;
+    ImVector_ImFontConfig ConfigData;
    int CustomRectIds[1];
 };
 struct ImFont
@@ -760,9 +790,9 @@ struct ImFont
    float FontSize;
    float Scale;
    ImVec2 DisplayOffset;
-    ImVector/*<ImFontGlyph>*/ Glyphs;
-    ImVector/*<float>*/ IndexAdvanceX;
-    ImVector/*<unsigned short>*/ IndexLookup;
+    ImVector_ImFontGlyph Glyphs;
+    ImVector_float IndexAdvanceX;
+    ImVector_unsigned_short IndexLookup;
    const ImFontGlyph* FallbackGlyph;
    float FallbackAdvanceX;
    ImWchar FallbackChar;
@@ -775,7 +805,7 @@ struct ImFont
 };
    struct GlyphRangesBuilder
    {
-        ImVector/*<unsigned char>*/ UsedChars;
+        ImVector_unsigned_char UsedChars;
    };
    struct CustomRect
    {
@@ -832,10 +862,13 @@ typedef ImGuiTextFilter::TextRange TextRange;
 typedef ImGuiStorage::Pair Pair;
 typedef ImVector<TextRange> ImVector_TextRange;
 typedef ImVector<ImWchar> ImVector_ImWchar;
-#else //CIMGUI_DEFINE_ENUMS_AND_STRUCTS
-typedef ImVector ImVector_TextRange;
-typedef ImVector ImVector_ImWchar;
 #endif //CIMGUI_DEFINE_ENUMS_AND_STRUCTS
+CIMGUI_API ImVec2* ImVec2_ImVec2(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 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);
 CIMGUI_API void igDestroyContext(ImGuiContext* ctx);
 CIMGUI_API ImGuiContext* igGetCurrentContext(void);
@@ -1169,19 +1202,31 @@ CIMGUI_API const char* igSaveIniSettingsToMemory(size_t* out_ini_size);
 CIMGUI_API void igSetAllocatorFunctions(void*(*alloc_func)(size_t sz,void* user_data),void(*free_func)(void* ptr,void* user_data),void* user_data);
 CIMGUI_API void* igMemAlloc(size_t size);
 CIMGUI_API void igMemFree(void* ptr);
+CIMGUI_API ImGuiStyle* ImGuiStyle_ImGuiStyle(void);
+CIMGUI_API void ImGuiStyle_destroy(ImGuiStyle* self);
 CIMGUI_API void ImGuiStyle_ScaleAllSizes(ImGuiStyle* self,float scale_factor);
 CIMGUI_API void ImGuiIO_AddInputCharacter(ImGuiIO* self,ImWchar c);
 CIMGUI_API void ImGuiIO_AddInputCharactersUTF8(ImGuiIO* self,const char* utf8_chars);
 CIMGUI_API void ImGuiIO_ClearInputCharacters(ImGuiIO* self);
+CIMGUI_API ImGuiIO* ImGuiIO_ImGuiIO(void);
+CIMGUI_API void ImGuiIO_destroy(ImGuiIO* self);
+CIMGUI_API ImGuiOnceUponAFrame* ImGuiOnceUponAFrame_ImGuiOnceUponAFrame(void);
+CIMGUI_API void ImGuiOnceUponAFrame_destroy(ImGuiOnceUponAFrame* self);
+CIMGUI_API ImGuiTextFilter* ImGuiTextFilter_ImGuiTextFilter(const char* default_filter);
 CIMGUI_API bool ImGuiTextFilter_Draw(ImGuiTextFilter* self,const char* label,float width);
 CIMGUI_API bool ImGuiTextFilter_PassFilter(ImGuiTextFilter* self,const char* text,const char* text_end);
 CIMGUI_API void ImGuiTextFilter_Build(ImGuiTextFilter* self);
 CIMGUI_API void ImGuiTextFilter_Clear(ImGuiTextFilter* self);
 CIMGUI_API bool ImGuiTextFilter_IsActive(ImGuiTextFilter* self);
+CIMGUI_API TextRange* TextRange_TextRange(void);
+CIMGUI_API void TextRange_destroy(TextRange* self);
+CIMGUI_API TextRange* TextRange_TextRangeStr(const char* _b,const char* _e);
 CIMGUI_API const char* TextRange_begin(TextRange* self);
 CIMGUI_API const char* TextRange_end(TextRange* self);
 CIMGUI_API bool TextRange_empty(TextRange* self);
 CIMGUI_API void TextRange_split(TextRange* self,char separator,ImVector_TextRange* out);
+CIMGUI_API ImGuiTextBuffer* ImGuiTextBuffer_ImGuiTextBuffer(void);
+CIMGUI_API void ImGuiTextBuffer_destroy(ImGuiTextBuffer* self);
 CIMGUI_API const char* ImGuiTextBuffer_begin(ImGuiTextBuffer* self);
 CIMGUI_API const char* ImGuiTextBuffer_end(ImGuiTextBuffer* self);
 CIMGUI_API int ImGuiTextBuffer_size(ImGuiTextBuffer* self);
@@ -1190,6 +1235,9 @@ CIMGUI_API void ImGuiTextBuffer_clear(ImGuiTextBuffer* self);
 CIMGUI_API void ImGuiTextBuffer_reserve(ImGuiTextBuffer* self,int capacity);
 CIMGUI_API const char* ImGuiTextBuffer_c_str(ImGuiTextBuffer* self);
 CIMGUI_API void ImGuiTextBuffer_appendfv(ImGuiTextBuffer* self,const char* fmt,va_list args);
+CIMGUI_API Pair* Pair_PairInt(ImGuiID _key,int _val_i);
+CIMGUI_API Pair* Pair_PairFloat(ImGuiID _key,float _val_f);
+CIMGUI_API Pair* Pair_PairPtr(ImGuiID _key,void* _val_p);
 CIMGUI_API void ImGuiStorage_Clear(ImGuiStorage* self);
 CIMGUI_API int ImGuiStorage_GetInt(ImGuiStorage* self,ImGuiID key,int default_val);
 CIMGUI_API void ImGuiStorage_SetInt(ImGuiStorage* self,ImGuiID key,int val);
@@ -1205,18 +1253,32 @@ CIMGUI_API float* ImGuiStorage_GetFloatRef(ImGuiStorage* self,ImGuiID key,float
 CIMGUI_API void** ImGuiStorage_GetVoidPtrRef(ImGuiStorage* self,ImGuiID key,void* default_val);
 CIMGUI_API void ImGuiStorage_SetAllInt(ImGuiStorage* self,int val);
 CIMGUI_API void ImGuiStorage_BuildSortByKey(ImGuiStorage* self);
+CIMGUI_API ImGuiInputTextCallbackData* ImGuiInputTextCallbackData_ImGuiInputTextCallbackData(void);
+CIMGUI_API void ImGuiInputTextCallbackData_destroy(ImGuiInputTextCallbackData* self);
 CIMGUI_API void ImGuiInputTextCallbackData_DeleteChars(ImGuiInputTextCallbackData* self,int pos,int bytes_count);
 CIMGUI_API void ImGuiInputTextCallbackData_InsertChars(ImGuiInputTextCallbackData* self,int pos,const char* text,const char* text_end);
 CIMGUI_API bool ImGuiInputTextCallbackData_HasSelection(ImGuiInputTextCallbackData* self);
+CIMGUI_API ImGuiPayload* ImGuiPayload_ImGuiPayload(void);
+CIMGUI_API void ImGuiPayload_destroy(ImGuiPayload* self);
 CIMGUI_API void ImGuiPayload_Clear(ImGuiPayload* self);
 CIMGUI_API bool ImGuiPayload_IsDataType(ImGuiPayload* self,const char* type);
 CIMGUI_API bool ImGuiPayload_IsPreview(ImGuiPayload* self);
 CIMGUI_API bool ImGuiPayload_IsDelivery(ImGuiPayload* self);
+CIMGUI_API ImColor* ImColor_ImColor(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 ImGuiListClipper* ImGuiListClipper_ImGuiListClipper(int items_count,float items_height);
 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 ImDrawCmd* ImDrawCmd_ImDrawCmd(void);
+CIMGUI_API void ImDrawCmd_destroy(ImDrawCmd* self);
+CIMGUI_API ImDrawList* ImDrawList_ImDrawList(const ImDrawListSharedData* shared_data);
 CIMGUI_API void ImDrawList_PushClipRect(ImDrawList* self,ImVec2 clip_rect_min,ImVec2 clip_rect_max,bool intersect_with_current_clip_rect);
 CIMGUI_API void ImDrawList_PushClipRectFullScreen(ImDrawList* self);
 CIMGUI_API void ImDrawList_PopClipRect(ImDrawList* self);
@@ -1268,9 +1330,15 @@ CIMGUI_API void ImDrawList_PrimWriteIdx(ImDrawList* self,ImDrawIdx idx);
 CIMGUI_API void ImDrawList_PrimVtx(ImDrawList* self,const ImVec2 pos,const ImVec2 uv,ImU32 col);
 CIMGUI_API void ImDrawList_UpdateClipRect(ImDrawList* self);
 CIMGUI_API void ImDrawList_UpdateTextureID(ImDrawList* self);
+CIMGUI_API ImDrawData* ImDrawData_ImDrawData(void);
+CIMGUI_API void ImDrawData_destroy(ImDrawData* self);
 CIMGUI_API void ImDrawData_Clear(ImDrawData* self);
 CIMGUI_API void ImDrawData_DeIndexAllBuffers(ImDrawData* self);
 CIMGUI_API void ImDrawData_ScaleClipRects(ImDrawData* self,const ImVec2 sc);
+CIMGUI_API ImFontConfig* ImFontConfig_ImFontConfig(void);
+CIMGUI_API void ImFontConfig_destroy(ImFontConfig* self);
+CIMGUI_API ImFontAtlas* ImFontAtlas_ImFontAtlas(void);
+CIMGUI_API void ImFontAtlas_destroy(ImFontAtlas* self);
 CIMGUI_API ImFont* ImFontAtlas_AddFont(ImFontAtlas* self,const ImFontConfig* font_cfg);
 CIMGUI_API ImFont* ImFontAtlas_AddFontDefault(ImFontAtlas* self,const ImFontConfig* font_cfg);
 CIMGUI_API ImFont* ImFontAtlas_AddFontFromFileTTF(ImFontAtlas* self,const char* filename,float size_pixels,const ImFontConfig* font_cfg,const ImWchar* glyph_ranges);
@@ -1293,18 +1361,24 @@ CIMGUI_API const ImWchar* ImFontAtlas_GetGlyphRangesChineseFull(ImFontAtlas* sel
 CIMGUI_API const ImWchar* ImFontAtlas_GetGlyphRangesChineseSimplifiedCommon(ImFontAtlas* self);
 CIMGUI_API const ImWchar* ImFontAtlas_GetGlyphRangesCyrillic(ImFontAtlas* self);
 CIMGUI_API const ImWchar* ImFontAtlas_GetGlyphRangesThai(ImFontAtlas* self);
+CIMGUI_API GlyphRangesBuilder* GlyphRangesBuilder_GlyphRangesBuilder(void);
+CIMGUI_API void GlyphRangesBuilder_destroy(GlyphRangesBuilder* self);
 CIMGUI_API bool GlyphRangesBuilder_GetBit(GlyphRangesBuilder* self,int n);
 CIMGUI_API void GlyphRangesBuilder_SetBit(GlyphRangesBuilder* self,int n);
 CIMGUI_API void GlyphRangesBuilder_AddChar(GlyphRangesBuilder* self,ImWchar c);
 CIMGUI_API void GlyphRangesBuilder_AddText(GlyphRangesBuilder* self,const char* text,const char* text_end);
 CIMGUI_API void GlyphRangesBuilder_AddRanges(GlyphRangesBuilder* self,const ImWchar* ranges);
 CIMGUI_API void GlyphRangesBuilder_BuildRanges(GlyphRangesBuilder* self,ImVector_ImWchar* out_ranges);
+CIMGUI_API CustomRect* CustomRect_CustomRect(void);
+CIMGUI_API void CustomRect_destroy(CustomRect* self);
 CIMGUI_API bool CustomRect_IsPacked(CustomRect* self);
 CIMGUI_API int ImFontAtlas_AddCustomRectRegular(ImFontAtlas* self,unsigned int id,int width,int height);
 CIMGUI_API int ImFontAtlas_AddCustomRectFontGlyph(ImFontAtlas* self,ImFont* font,ImWchar id,int width,int height,float advance_x,const ImVec2 offset);
 CIMGUI_API const CustomRect* ImFontAtlas_GetCustomRectByIndex(ImFontAtlas* self,int index);
 CIMGUI_API void ImFontAtlas_CalcCustomRectUV(ImFontAtlas* self,const CustomRect* rect,ImVec2* out_uv_min,ImVec2* out_uv_max);
 CIMGUI_API bool ImFontAtlas_GetMouseCursorTexData(ImFontAtlas* self,ImGuiMouseCursor cursor,ImVec2* out_offset,ImVec2* out_size,ImVec2 out_uv_border[2],ImVec2 out_uv_fill[2]);
+CIMGUI_API ImFont* ImFont_ImFont(void);
+CIMGUI_API void ImFont_destroy(ImFont* self);
 CIMGUI_API void ImFont_ClearOutputData(ImFont* self);
 CIMGUI_API void ImFont_BuildLookupTable(ImFont* self);
 CIMGUI_API const ImFontGlyph* ImFont_FindGlyph(ImFont* self,ImWchar c);
@@ -1371,12 +1445,17 @@ CIMGUI_API ImVec2_Simple ImFont_CalcTextSizeA_nonUDT2(ImFont* self,float size,fl
 CIMGUI_API void igLogText(CONST char *fmt, ...);
 //no appendfV
 CIMGUI_API void ImGuiTextBuffer_appendf(struct ImGuiTextBuffer *buffer, const char *fmt, ...);
-CIMGUI_API void ImFontConfig_DefaultConstructor(ImFontConfig *config);
 //for getting FLT_MAX in bindings
 CIMGUI_API float igGET_FLT_MAX();
 //not const args from & to *
 CIMGUI_API void igColorConvertRGBtoHSV(float r,float g,float b,float *out_h,float *out_s,float *out_v);
 CIMGUI_API void igColorConvertHSVtoRGB(float h,float s,float v,float *out_r,float *out_g,float *out_b);

+CIMGUI_API ImVector_ImWchar* ImVector_ImWchar_create();
+CIMGUI_API void ImVector_ImWchar_destroy(ImVector_ImWchar* p);
+CIMGUI_API void ImVector_ImWchar_Init(ImVector_ImWchar* p);
+CIMGUI_API void ImVector_ImWchar_UnInit(ImVector_ImWchar* p);
+
+


--- a/generator/cimgui_template.cpp
+++ b/generator/cimgui_template.cpp
@@ -25,10 +25,7 @@ CIMGUI_API void ImGuiTextBuffer_appendf(struct ImGuiTextBuffer *buffer, const ch
    buffer->appendfv(fmt, args);
    va_end(args);
 }
-CIMGUI_API void ImFontConfig_DefaultConstructor(ImFontConfig *config)
-{
-    *config = ImFontConfig();
-}
+
 CIMGUI_API float igGET_FLT_MAX()
 {
    return FLT_MAX;
@@ -41,3 +38,21 @@ CIMGUI_API void igColorConvertHSVtoRGB(float h,float s,float v,float *out_r,floa
 {
    ImGui::ColorConvertHSVtoRGB(h,s,v,*out_r,*out_g,*out_b);
 }
+
+CIMGUI_API ImVector_ImWchar* ImVector_ImWchar_create()
+{
+	return IM_NEW(ImVector<ImWchar>) ();
+}
+CIMGUI_API void ImVector_ImWchar_destroy(ImVector_ImWchar* p)
+{
+	IM_DELETE(p);
+}
+CIMGUI_API void ImVector_ImWchar_Init(ImVector_ImWchar* p)
+{
+	IM_PLACEMENT_NEW(p) ImVector<ImWchar>();
+}
+CIMGUI_API void ImVector_ImWchar_UnInit(ImVector_ImWchar* p)
+{
+	p->~ImVector<ImWchar>();
+}
+
--- a/generator/cimgui_template.h
+++ b/generator/cimgui_template.h
@@ -1,6 +1,6 @@

 #include <stdio.h>
-
+#include <stdint.h>
 #if defined _WIN32 || defined __CYGWIN__
    #ifdef CIMGUI_NO_EXPORT
        #define API
@@ -75,12 +75,17 @@ inline ImColor_Simple ImColorToSimple(ImColor col)
 CIMGUI_API void igLogText(CONST char *fmt, ...);
 //no appendfV
 CIMGUI_API void ImGuiTextBuffer_appendf(struct ImGuiTextBuffer *buffer, const char *fmt, ...);
-CIMGUI_API void ImFontConfig_DefaultConstructor(ImFontConfig *config);
 //for getting FLT_MAX in bindings
 CIMGUI_API float igGET_FLT_MAX();
 //not const args from & to *
 CIMGUI_API void igColorConvertRGBtoHSV(float r,float g,float b,float *out_h,float *out_s,float *out_v);
 CIMGUI_API void igColorConvertHSVtoRGB(float h,float s,float v,float *out_r,float *out_g,float *out_b);

+CIMGUI_API ImVector_ImWchar* ImVector_ImWchar_create();
+CIMGUI_API void ImVector_ImWchar_destroy(ImVector_ImWchar* p);
+CIMGUI_API void ImVector_ImWchar_Init(ImVector_ImWchar* p);
+CIMGUI_API void ImVector_ImWchar_UnInit(ImVector_ImWchar* p);
+
+


--- a/generator/generator.lua
+++ b/generator/generator.lua
@@ -383,7 +383,9 @@ local function struct_parser()
    
    local in_functionst = false
    local structcdefs = {}
+	local ImVector_templates = {}
    local STP = {}
+	STP.ImVector_templates = ImVector_templates
    STP.lines = structcdefs
    function STP.insert(line,comment)
    
@@ -416,7 +418,15 @@ local function struct_parser()
            --nothing
        else
            local linea = line:gsub("%S+",{class="struct",mutable=""})
-            linea = linea:gsub("(%b<>)","/*%1*/") --comment template parameters
+			local template = linea:match("ImVector<(.+)>")
+            if template then
+				local te = template:gsub("%s","_")
+				te = te:gsub("%*","Ptr")
+                ImVector_templates[template] = true
+				linea = linea:gsub("(%b<>)","_"..te) --comment template parameters
+            end
+            --linea = linea:gsub("(%b<>)","/*%1*/") --comment template parameters
+			--linea = linea:gsub("<([%w_]+)>","_%1") --ImVector expand templates
            table.insert(structcdefs,linea..comment)
        end
        return 
@@ -596,8 +606,10 @@ local function func_parser()
                -- end
                --argscsinpars = argscsinpars:gsub("&","")
                
-                local template = argscsinpars:match("ImVector<([%w_]+)>")
+                local template = argscsinpars:match("ImVector<(.+)>")
                if template then
+					--template = template:gsub("%s","_")
+					--template = template:gsub("%*","Ptr")
                    ImVector_templates[template] = true
                end
                
@@ -786,7 +798,7 @@ local function ADDnonUDT(FP)
 			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 =ret,comment=comment})
+			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,comment=comment})
 			--converting to Simple type----------------------------------------------------
 			local defT3 = {}
 			--first strings
@@ -807,7 +819,7 @@ local function ADDnonUDT(FP)
 			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 =ret,comment=comment})
+			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,comment=comment})
 		end
 		end
 	end
@@ -923,8 +935,16 @@ local function gen_structs_and_enums_table(cdefs)
                end
                --split type name1,name2; in several lines
                local typen,rest = line:match("([^,]+)%s(%S+[,;])")
+				--local template_type = typen:match("/%*<(.+)>%*/")
+				--if template_type then typen = typen:match("(.+)/%*") end
+				local template_type = typen:match("ImVector_(.+)")
+				if template_type then 
+					typen = "ImVector"
+					template_type = template_type:gsub("_"," ")
+					template_type = template_type:gsub("Ptr","%*")
+				end
                for name in rest:gmatch("([^%s,;]+)%s?[,;]") do
-                    table.insert(outtab.structs[structnames[#structnames]],{type=typen,name=name})
+                    table.insert(outtab.structs[structnames[#structnames]],{type=typen,template_type=template_type,name=name})
                end
            end
        end
@@ -977,8 +997,18 @@ local function gen_structs_and_enums_table(cdefs)
    return outtab, typedefs_dict
 end

+local function generate_templates(code,templates,typedefs)
+	for k,v in pairs(templates) do
+	--[[typedef struct ImVector{int Size;int Capacity;void* Data;} ImVector;]]
+		local te = k:gsub("%s","_")
+		te = te:gsub("%*","Ptr")
+		--table.insert(code,"typedef struct ImVector_"..te.." {int Size;int Capacity;"..k.."* Data;} ImVector_"..te..";\n")
+		table.insert(code,"struct ImVector_"..te.." {int Size;int Capacity;"..k.."* Data;} ImVector_"..te..";\n")
+		table.insert(typedefs,"typedef struct ImVector_"..te.." ImVector_"..te..";\n")
+	end
+end

-local function gen_structs_and_enums(cdefs)
+local function gen_structs_and_enums(cdefs,templates)
    local function_closing_re = "}"
    local namespace_re = "namespace"
    local in_namespace = false
@@ -990,7 +1020,7 @@ local function gen_structs_and_enums(cdefs)
    local innerstructs = {}
    local typedefs_table = {}
    local typedefs_dict = {}
-
+	local linetypedefs = 1 --math.huge
    local outtab = {}
    -- Output the file
    --table.insert(outtab,"/////////////// BEGIN AUTOGENERATED SEGMENT\n")
@@ -1019,15 +1049,8 @@ local function gen_structs_and_enums(cdefs)
        -- ImVector special treatment
        if structnames[#structnames] == "ImVector" then
            if line:match(struct_closing_re) then
-                table.insert(outtab,[[
-struct ImVector
-{
-    int Size;
-    int Capacity;
-    void* Data;
-};
-typedef struct ImVector ImVector;
-]])
+                table.insert(outtab,[[typedef struct ImVector{int Size;int Capacity;void* Data;} ImVector;]].."\n")
+				generate_templates(outtab,templates,typedefs_table)
                structnames[#structnames] = nil
            end
            break -- dont write
@@ -1041,9 +1064,14 @@ typedef struct ImVector ImVector;
        end
        
        if #structnames < 2 then -- not inner
+			if line:match("typedef") and line:match("ImDrawIdx") then --save typedefs of ImDrawIdx
+				table.insert(typedefs_table,line..";\n")
+				--linetypedefs = math.min(linetypedefs,#outtab)
+                break
+			end
            if (#structnames > 0) then
                if line:match("typedef") then --dont allow inner typedefs
-                    break
+                    break --already saved
                elseif not line:match("^{$") and not line:match(struct_closing_re) then --avoid tab { and };
                    --line = "    "..line
                end
@@ -1052,6 +1080,7 @@ typedef struct ImVector ImVector;
            local struct_closed_name = line:match(struct_closed_re)
            if struct_closed_name then
                table.insert(typedefs_table,"typedef struct "..struct_closed_name.." "..struct_closed_name..";\n")
+				--linetypedefs = math.min(linetypedefs,#outtab)
                typedefs_dict[struct_closed_name] = "struct "..struct_closed_name
            end
        end
@@ -1068,6 +1097,7 @@ typedef struct ImVector ImVector;
                    local structname = structnames[#structnames]
                    --st[#st + 1] = string.format("typedef struct %s %s;\n",structname,structname)
                    table.insert(typedefs_table,string.format("typedef struct %s %s;\n",structname,structname))
+					--linetypedefs = math.min(linetypedefs,#outtab)
                    typedefs_dict[structname] = "struct "..structname
                    structnames[#structnames] = nil
                end
@@ -1075,6 +1105,7 @@ typedef struct ImVector ImVector;
                local structname = structnames[#structnames]
                --table.insert(outtab,"typedef struct "..structname.." "..structname..";\n")
                table.insert(typedefs_table,"typedef struct "..structname.." "..structname..";\n")
+				--linetypedefs = math.min(linetypedefs,#outtab)
                typedefs_dict[structname] = "struct "..structname
                structnames[#structnames] = nil
            end
@@ -1094,7 +1125,7 @@ typedef struct ImVector ImVector;
    for i,l in ipairs(typedefs_table) do
        if not uniques[l] then
            uniques[l] = true
-            table.insert(outtab,2,l)
+            table.insert(outtab,linetypedefs,l)
        end
    end
    local cstructsstr = table.concat(outtab)
@@ -1137,28 +1168,42 @@ local function func_header_generate(FP)
    for k,v in pairs(FP.ImVector_templates) do
        table.insert(outtab,"typedef ImVector<"..k.."> ImVector_"..k..";\n")
    end
-    table.insert(outtab,"#else //CIMGUI_DEFINE_ENUMS_AND_STRUCTS\n")
-    for k,v in pairs(FP.ImVector_templates) do
-        table.insert(outtab,"typedef ImVector ImVector_"..k..";\n")
-    end
+    -- table.insert(outtab,"#else //CIMGUI_DEFINE_ENUMS_AND_STRUCTS\n")
+    -- for k,v in pairs(FP.ImVector_templates) do
+        -- table.insert(outtab,"typedef ImVector ImVector_"..k..";\n")
+    -- end
    table.insert(outtab,"#endif //CIMGUI_DEFINE_ENUMS_AND_STRUCTS\n")
    for _,t in ipairs(FP.cdefs) do
        if t.cimguiname then
        local cimf = FP.defsT[t.cimguiname]
        local def = cimf[t.signature]
        local manual = get_manuals(def)
-        if not manual and def.ret then --not constructor
-            local addcoment = def.comment or ""
+        if not manual then
+			local addcoment = def.comment or ""
 			local empty = def.args:match("^%(%)") --no args
-            if def.stname == "ImGui" or def.stname == "" then --ImGui namespace or top level
-                table.insert(outtab,"CIMGUI_API".." "..def.ret.." "..(def.ov_cimguiname or def.cimguiname)..(empty and "(void)" or def.args)..";"..addcoment.."\n")
-            else
-                
-                --local imgui_stname = embeded_structs[def.stname] or def.stname
-                local imgui_stname = def.stname
-                local args = def.args:gsub("^%(","("..imgui_stname.."* self"..(empty and "" or ","))
-                table.insert(outtab,"CIMGUI_API".." "..def.ret.." "..(def.ov_cimguiname or def.cimguiname)..args..";"..addcoment.."\n")
-            end
+			if def.ret then --not constructor
+				if def.stname == "ImGui" or def.stname == "" then --ImGui namespace or top level
+					table.insert(outtab,"CIMGUI_API "..def.ret.." "..(def.ov_cimguiname or def.cimguiname)..(empty and "(void)" or def.args)..";"..addcoment.."\n")
+				else
+					--local imgui_stname = embeded_structs[def.stname] or def.stname
+					local imgui_stname = def.stname
+					local args = def.args:gsub("^%(","("..imgui_stname.."* self"..(empty and "" or ","))
+					table.insert(outtab,"CIMGUI_API "..def.ret.." "..(def.ov_cimguiname or def.cimguiname)..args..";"..addcoment.."\n")
+				end
+			else --constructor
+				assert(def.stname ~= "ImGui" and def.stname ~= "","constructor without struct")
+				if not def.funcname:match("~") then --constructor
+					table.insert(outtab,"CIMGUI_API "..def.stname.."* "..(def.ov_cimguiname or def.cimguiname)..(empty and "(void)" or def.args)..";"..addcoment.."\n")
+					if empty then
+						--make destructor also only once
+						local args = "("..def.stname.."* self)"
+						local fname = def.stname.."_destroy" 
+						table.insert(outtab,"CIMGUI_API void "..fname..args..";"..addcoment.."\n")
+					end
+				else --destructor
+				    --already done
+				end
+			end
        end
        else --not cimguiname
            table.insert(outtab,t.comment:gsub("%%","%%%%").."\n")-- %% substitution for gsub
@@ -1218,13 +1263,13 @@ local function func_implementation(FP)
 					table.insert(outtab,"    return ret2;\n")
                    table.insert(outtab,"}\n")
 					end
-                else
+                else --standard ImGui
                    table.insert(outtab,"CIMGUI_API".." "..def.ret.." "..(def.ov_cimguiname or def.cimguiname)..def.args.."\n")
                    table.insert(outtab,"{\n")
                    table.insert(outtab,"    return "..castret..ptret.."ImGui::"..def.funcname..def.call_args..";\n")
                    table.insert(outtab,"}\n")
                end
-            else
+            else -- stname
                local empty = def.args:match("^%(%)") --no args
                --local imgui_stname = embeded_structs[def.stname] or def.stname
                local imgui_stname = def.stname
@@ -1260,13 +1305,33 @@ local function func_implementation(FP)
 					table.insert(outtab,"    return ret2;\n")
                    table.insert(outtab,"}\n")
 					end
-                else
+                else --standard struct
                    table.insert(outtab,"CIMGUI_API".." "..def.ret.." "..(def.ov_cimguiname or def.cimguiname)..args.."\n")
                    table.insert(outtab,"{\n")
                    table.insert(outtab,"    return "..castret..ptret.."self->"..def.funcname..def.call_args..";\n")
                    table.insert(outtab,"}\n")
                end
            end
+		elseif not manual and not def.ret then --constructor and destructors
+			assert(def.stname ~= "ImGui" and def.stname ~= "","constructor without struct")
+			local empty = def.args:match("^%(%)") --no args
+			if not def.funcname:match("~") then --constructor
+				table.insert(outtab,"CIMGUI_API "..def.stname.."* "..(def.ov_cimguiname or def.cimguiname)..(empty and "(void)" or def.args).."\n")
+				table.insert(outtab,"{\n")
+				table.insert(outtab,"    return IM_NEW("..def.stname..")"..def.call_args..";\n")
+				table.insert(outtab,"}\n")
+				if empty then
+					--do destructor only once
+					local args = "("..def.stname.."* self)"
+					local fname = def.stname.."_destroy" 
+					table.insert(outtab,"CIMGUI_API void "..fname..args.."\n")
+					table.insert(outtab,"{\n")
+					table.insert(outtab,"    IM_DELETE(self);\n")
+					table.insert(outtab,"}\n")
+				end
+			else --destructor
+			    --already done
+			end
        end
        until true
    end
@@ -1347,11 +1412,13 @@ local function set_defines(fdefs)
 end   
 --generate cimgui.cpp cimgui.h and auto versions depending on postfix
 local function cimgui_generation(postfix,STP,FP)
+	--get all ImVector templates
+	local ImVector_templates = mergeT(STP.ImVector_templates,FP.ImVector_templates)
    --merge it in cimgui_template.h to cimgui.h
    local hfile = io.open("./cimgui_template.h","r")
    local hstrfile = hfile:read"*a"
    hfile:close()
-    local cstructsstr,typedefs_dict = gen_structs_and_enums(STP.lines)
+    local cstructsstr,typedefs_dict = gen_structs_and_enums(STP.lines,ImVector_templates)
    --for not gcc parsing
    if postfix == "_nopreprocess" then
        cstructsstr = "typedef unsigned short ImDrawIdx;\ntypedef void* ImTextureID;\n"..cstructsstr
@@ -1496,7 +1563,7 @@ local function json_prepare(defs)
    end
    return defs
 end
-
+---[[
 local json = require"json"
 save_data("./output/definitions.json",json.encode(json_prepare(pFP.defsT)))
 save_data("./output/structs_and_enums.json",json.encode(structs_and_enums_table))
@@ -1504,7 +1571,7 @@ save_data("./output/typedefs_dict.json",json.encode(typedefs_dict))
 if iFP then
    save_data("./output/impl_definitions.json",json.encode(json_prepare(iFP.defsT)))
 end
-
+--]]
 copyfile("./output/cimgui.h", "../cimgui.h")
 copyfile("./output/cimgui.cpp", "../cimgui.cpp")
 print"all done!!"
@@ -1512,26 +1579,37 @@ print"all done!!"
 ---dump some infos-----------------------------------------------------------------------
 ------------------------------------------------------------------------------------
 print"//-------alltypes--------------------------------------------------------------------"
-FP:dump_alltypes()
+pFP:dump_alltypes()
 print"//embeded_structs---------------------------------------------------------------------------"
-for k,v in pairs(FP.embeded_structs) do
+for k,v in pairs(pFP.embeded_structs) do
    --print(k,v)
    io.write("typedef ",v," ",k,";\n")
 end
 print"//templates---------------------------------------------------------------------------"
-for k,v in pairs(FP.ImVector_templates) do
+for k,v in pairs(pFP.ImVector_templates) do
    --print(k,v)
    io.write("typedef ImVector<",k,"> ImVector_",k,";\n")
 end
-
+for k,v in pairs(pSTP.ImVector_templates) do
+    --print(k,v)
+    io.write("typedef ImVector<",k,"> ImVector_",k,";\n")
+end
+require"anima.utils"
 print"//constructors------------------------------------------------------------------"
-for i,t in ipairs(FP.cdefs) do
+for i,t in ipairs(pFP.cdefs) do
    if t.cimguiname and not t.ret then
-    print(t.cimguiname,"\t",t.signature,"\t",t.args,"\t",t.argsc,"\t",t.call_args,"\t",t.ret)
+		local cimf = pFP.defsT[t.cimguiname]
+        local def = cimf[t.signature]
+		if not def.ret then
+			print(t.cimguiname,"\t",t.signature,t.ret)
+		else
+			print"constructor error"
+			prtable(def)
+		end
    end
 end
 print"//-------------------------------------------------------------------------------------"
-for i,t in ipairs(FP.cdefs) do
+for i,t in ipairs(pFP.cdefs) do
    --print(t.cimguiname,"   ",t.funcname,"\t",t.signature,"\t",t.args,"\t",t.argsc,"\t",t.call_args,"\t",t.ret) 
 end
 ---------------------------------------------------------------------------------------------
--- a/generator/output/cimgui.cpp
+++ b/generator/output/cimgui.cpp
@@ -5,6 +5,30 @@

 #include "./imgui/imgui_internal.h"

+CIMGUI_API ImVec2* ImVec2_ImVec2(void)
+{
+    return IM_NEW(ImVec2)();
+}
+CIMGUI_API void ImVec2_destroy(ImVec2* self)
+{
+    IM_DELETE(self);
+}
+CIMGUI_API ImVec2* ImVec2_ImVec2Float(float _x,float _y)
+{
+    return IM_NEW(ImVec2)(_x,_y);
+}
+CIMGUI_API ImVec4* ImVec4_ImVec4(void)
+{
+    return IM_NEW(ImVec4)();
+}
+CIMGUI_API void ImVec4_destroy(ImVec4* self)
+{
+    IM_DELETE(self);
+}
+CIMGUI_API ImVec4* ImVec4_ImVec4Float(float _x,float _y,float _z,float _w)
+{
+    return IM_NEW(ImVec4)(_x,_y,_z,_w);
+}
 CIMGUI_API ImGuiContext* igCreateContext(ImFontAtlas* shared_font_atlas)
 {
    return ImGui::CreateContext(shared_font_atlas);
@@ -1374,6 +1398,14 @@ CIMGUI_API void igMemFree(void* ptr)
 {
    return ImGui::MemFree(ptr);
 }
+CIMGUI_API ImGuiStyle* ImGuiStyle_ImGuiStyle(void)
+{
+    return IM_NEW(ImGuiStyle)();
+}
+CIMGUI_API void ImGuiStyle_destroy(ImGuiStyle* self)
+{
+    IM_DELETE(self);
+}
 CIMGUI_API void ImGuiStyle_ScaleAllSizes(ImGuiStyle* self,float scale_factor)
 {
    return self->ScaleAllSizes(scale_factor);
@@ -1390,6 +1422,26 @@ CIMGUI_API void ImGuiIO_ClearInputCharacters(ImGuiIO* self)
 {
    return self->ClearInputCharacters();
 }
+CIMGUI_API ImGuiIO* ImGuiIO_ImGuiIO(void)
+{
+    return IM_NEW(ImGuiIO)();
+}
+CIMGUI_API void ImGuiIO_destroy(ImGuiIO* self)
+{
+    IM_DELETE(self);
+}
+CIMGUI_API ImGuiOnceUponAFrame* ImGuiOnceUponAFrame_ImGuiOnceUponAFrame(void)
+{
+    return IM_NEW(ImGuiOnceUponAFrame)();
+}
+CIMGUI_API void ImGuiOnceUponAFrame_destroy(ImGuiOnceUponAFrame* self)
+{
+    IM_DELETE(self);
+}
+CIMGUI_API ImGuiTextFilter* ImGuiTextFilter_ImGuiTextFilter(const char* default_filter)
+{
+    return IM_NEW(ImGuiTextFilter)(default_filter);
+}
 CIMGUI_API bool ImGuiTextFilter_Draw(ImGuiTextFilter* self,const char* label,float width)
 {
    return self->Draw(label,width);
@@ -1410,6 +1462,18 @@ CIMGUI_API bool ImGuiTextFilter_IsActive(ImGuiTextFilter* self)
 {
    return self->IsActive();
 }
+CIMGUI_API TextRange* TextRange_TextRange(void)
+{
+    return IM_NEW(TextRange)();
+}
+CIMGUI_API void TextRange_destroy(TextRange* self)
+{
+    IM_DELETE(self);
+}
+CIMGUI_API TextRange* TextRange_TextRangeStr(const char* _b,const char* _e)
+{
+    return IM_NEW(TextRange)(_b,_e);
+}
 CIMGUI_API const char* TextRange_begin(TextRange* self)
 {
    return self->begin();
@@ -1426,6 +1490,14 @@ CIMGUI_API void TextRange_split(TextRange* self,char separator,ImVector_TextRang
 {
    return self->split(separator,out);
 }
+CIMGUI_API ImGuiTextBuffer* ImGuiTextBuffer_ImGuiTextBuffer(void)
+{
+    return IM_NEW(ImGuiTextBuffer)();
+}
+CIMGUI_API void ImGuiTextBuffer_destroy(ImGuiTextBuffer* self)
+{
+    IM_DELETE(self);
+}
 CIMGUI_API const char* ImGuiTextBuffer_begin(ImGuiTextBuffer* self)
 {
    return self->begin();
@@ -1458,6 +1530,18 @@ CIMGUI_API void ImGuiTextBuffer_appendfv(ImGuiTextBuffer* self,const char* fmt,v
 {
    return self->appendfv(fmt,args);
 }
+CIMGUI_API Pair* Pair_PairInt(ImGuiID _key,int _val_i)
+{
+    return IM_NEW(Pair)(_key,_val_i);
+}
+CIMGUI_API Pair* Pair_PairFloat(ImGuiID _key,float _val_f)
+{
+    return IM_NEW(Pair)(_key,_val_f);
+}
+CIMGUI_API Pair* Pair_PairPtr(ImGuiID _key,void* _val_p)
+{
+    return IM_NEW(Pair)(_key,_val_p);
+}
 CIMGUI_API void ImGuiStorage_Clear(ImGuiStorage* self)
 {
    return self->Clear();
@@ -1518,6 +1602,14 @@ CIMGUI_API void ImGuiStorage_BuildSortByKey(ImGuiStorage* self)
 {
    return self->BuildSortByKey();
 }
+CIMGUI_API ImGuiInputTextCallbackData* ImGuiInputTextCallbackData_ImGuiInputTextCallbackData(void)
+{
+    return IM_NEW(ImGuiInputTextCallbackData)();
+}
+CIMGUI_API void ImGuiInputTextCallbackData_destroy(ImGuiInputTextCallbackData* self)
+{
+    IM_DELETE(self);
+}
 CIMGUI_API void ImGuiInputTextCallbackData_DeleteChars(ImGuiInputTextCallbackData* self,int pos,int bytes_count)
 {
    return self->DeleteChars(pos,bytes_count);
@@ -1530,6 +1622,14 @@ CIMGUI_API bool ImGuiInputTextCallbackData_HasSelection(ImGuiInputTextCallbackDa
 {
    return self->HasSelection();
 }
+CIMGUI_API ImGuiPayload* ImGuiPayload_ImGuiPayload(void)
+{
+    return IM_NEW(ImGuiPayload)();
+}
+CIMGUI_API void ImGuiPayload_destroy(ImGuiPayload* self)
+{
+    IM_DELETE(self);
+}
 CIMGUI_API void ImGuiPayload_Clear(ImGuiPayload* self)
 {
    return self->Clear();
@@ -1546,6 +1646,30 @@ CIMGUI_API bool ImGuiPayload_IsDelivery(ImGuiPayload* self)
 {
    return self->IsDelivery();
 }
+CIMGUI_API ImColor* ImColor_ImColor(void)
+{
+    return IM_NEW(ImColor)();
+}
+CIMGUI_API void ImColor_destroy(ImColor* self)
+{
+    IM_DELETE(self);
+}
+CIMGUI_API ImColor* ImColor_ImColorInt(int r,int g,int b,int a)
+{
+    return IM_NEW(ImColor)(r,g,b,a);
+}
+CIMGUI_API ImColor* ImColor_ImColorU32(ImU32 rgba)
+{
+    return IM_NEW(ImColor)(rgba);
+}
+CIMGUI_API ImColor* ImColor_ImColorFloat(float r,float g,float b,float a)
+{
+    return IM_NEW(ImColor)(r,g,b,a);
+}
+CIMGUI_API ImColor* ImColor_ImColorVec4(const ImVec4 col)
+{
+    return IM_NEW(ImColor)(col);
+}
 CIMGUI_API void ImColor_SetHSV(ImColor* self,float h,float s,float v,float a)
 {
    return self->SetHSV(h,s,v,a);
@@ -1554,6 +1678,10 @@ CIMGUI_API ImColor ImColor_HSV(ImColor* self,float h,float s,float v,float a)
 {
    return self->HSV(h,s,v,a);
 }
+CIMGUI_API ImGuiListClipper* ImGuiListClipper_ImGuiListClipper(int items_count,float items_height)
+{
+    return IM_NEW(ImGuiListClipper)(items_count,items_height);
+}
 CIMGUI_API bool ImGuiListClipper_Step(ImGuiListClipper* self)
 {
    return self->Step();
@@ -1566,6 +1694,18 @@ CIMGUI_API void ImGuiListClipper_End(ImGuiListClipper* self)
 {
    return self->End();
 }
+CIMGUI_API ImDrawCmd* ImDrawCmd_ImDrawCmd(void)
+{
+    return IM_NEW(ImDrawCmd)();
+}
+CIMGUI_API void ImDrawCmd_destroy(ImDrawCmd* self)
+{
+    IM_DELETE(self);
+}
+CIMGUI_API ImDrawList* ImDrawList_ImDrawList(const ImDrawListSharedData* shared_data)
+{
+    return IM_NEW(ImDrawList)(shared_data);
+}
 CIMGUI_API void ImDrawList_PushClipRect(ImDrawList* self,ImVec2 clip_rect_min,ImVec2 clip_rect_max,bool intersect_with_current_clip_rect)
 {
    return self->PushClipRect(clip_rect_min,clip_rect_max,intersect_with_current_clip_rect);
@@ -1770,6 +1910,14 @@ CIMGUI_API void ImDrawList_UpdateTextureID(ImDrawList* self)
 {
    return self->UpdateTextureID();
 }
+CIMGUI_API ImDrawData* ImDrawData_ImDrawData(void)
+{
+    return IM_NEW(ImDrawData)();
+}
+CIMGUI_API void ImDrawData_destroy(ImDrawData* self)
+{
+    IM_DELETE(self);
+}
 CIMGUI_API void ImDrawData_Clear(ImDrawData* self)
 {
    return self->Clear();
@@ -1782,6 +1930,22 @@ CIMGUI_API void ImDrawData_ScaleClipRects(ImDrawData* self,const ImVec2 sc)
 {
    return self->ScaleClipRects(sc);
 }
+CIMGUI_API ImFontConfig* ImFontConfig_ImFontConfig(void)
+{
+    return IM_NEW(ImFontConfig)();
+}
+CIMGUI_API void ImFontConfig_destroy(ImFontConfig* self)
+{
+    IM_DELETE(self);
+}
+CIMGUI_API ImFontAtlas* ImFontAtlas_ImFontAtlas(void)
+{
+    return IM_NEW(ImFontAtlas)();
+}
+CIMGUI_API void ImFontAtlas_destroy(ImFontAtlas* self)
+{
+    IM_DELETE(self);
+}
 CIMGUI_API ImFont* ImFontAtlas_AddFont(ImFontAtlas* self,const ImFontConfig* font_cfg)
 {
    return self->AddFont(font_cfg);
@@ -1870,6 +2034,14 @@ CIMGUI_API const ImWchar* ImFontAtlas_GetGlyphRangesThai(ImFontAtlas* self)
 {
    return self->GetGlyphRangesThai();
 }
+CIMGUI_API GlyphRangesBuilder* GlyphRangesBuilder_GlyphRangesBuilder(void)
+{
+    return IM_NEW(GlyphRangesBuilder)();
+}
+CIMGUI_API void GlyphRangesBuilder_destroy(GlyphRangesBuilder* self)
+{
+    IM_DELETE(self);
+}
 CIMGUI_API bool GlyphRangesBuilder_GetBit(GlyphRangesBuilder* self,int n)
 {
    return self->GetBit(n);
@@ -1894,6 +2066,14 @@ CIMGUI_API void GlyphRangesBuilder_BuildRanges(GlyphRangesBuilder* self,ImVector
 {
    return self->BuildRanges(out_ranges);
 }
+CIMGUI_API CustomRect* CustomRect_CustomRect(void)
+{
+    return IM_NEW(CustomRect)();
+}
+CIMGUI_API void CustomRect_destroy(CustomRect* self)
+{
+    IM_DELETE(self);
+}
 CIMGUI_API bool CustomRect_IsPacked(CustomRect* self)
 {
    return self->IsPacked();
@@ -1918,6 +2098,14 @@ CIMGUI_API bool ImFontAtlas_GetMouseCursorTexData(ImFontAtlas* self,ImGuiMouseCu
 {
    return self->GetMouseCursorTexData(cursor,out_offset,out_size,out_uv_border,out_uv_fill);
 }
+CIMGUI_API ImFont* ImFont_ImFont(void)
+{
+    return IM_NEW(ImFont)();
+}
+CIMGUI_API void ImFont_destroy(ImFont* self)
+{
+    IM_DELETE(self);
+}
 CIMGUI_API void ImFont_ClearOutputData(ImFont* self)
 {
    return self->ClearOutputData();
@@ -2219,10 +2407,7 @@ CIMGUI_API void ImGuiTextBuffer_appendf(struct ImGuiTextBuffer *buffer, const ch
    buffer->appendfv(fmt, args);
    va_end(args);
 }
-CIMGUI_API void ImFontConfig_DefaultConstructor(ImFontConfig *config)
-{
-    *config = ImFontConfig();
-}
+
 CIMGUI_API float igGET_FLT_MAX()
 {
    return FLT_MAX;
@@ -2235,3 +2420,21 @@ CIMGUI_API void igColorConvertHSVtoRGB(float h,float s,float v,float *out_r,floa
 {
    ImGui::ColorConvertHSVtoRGB(h,s,v,*out_r,*out_g,*out_b);
 }
+
+CIMGUI_API ImVector_ImWchar* ImVector_ImWchar_create()
+{
+	return IM_NEW(ImVector<ImWchar>) ();
+}
+CIMGUI_API void ImVector_ImWchar_destroy(ImVector_ImWchar* p)
+{
+	IM_DELETE(p);
+}
+CIMGUI_API void ImVector_ImWchar_Init(ImVector_ImWchar* p)
+{
+	IM_PLACEMENT_NEW(p) ImVector<ImWchar>();
+}
+CIMGUI_API void ImVector_ImWchar_UnInit(ImVector_ImWchar* p)
+{
+	p->~ImVector<ImWchar>();
+}
+
--- a/generator/output/cimgui.h
+++ b/generator/output/cimgui.h
@@ -1,7 +1,7 @@
 //This file is automatically generated by generator.lua from https://github.com/cimgui/cimgui
 //based on imgui.h file version "1.65" from Dear ImGui https://github.com/ocornut/imgui
 #include <stdio.h>
-
+#include <stdint.h>
 #if defined _WIN32 || defined __CYGWIN__
    #ifdef CIMGUI_NO_EXPORT
        #define API
@@ -40,12 +40,30 @@ typedef struct ImColor_Simple { ImVec4_Simple Value;} ImColor_Simple;


 #ifdef CIMGUI_DEFINE_ENUMS_AND_STRUCTS
-struct ImDrawChannel;
 typedef struct CustomRect CustomRect;
 typedef struct GlyphRangesBuilder GlyphRangesBuilder;
 typedef struct ImFontGlyph ImFontGlyph;
+typedef unsigned short ImDrawIdx;;
 typedef struct Pair Pair;
 typedef struct TextRange TextRange;
+typedef struct ImVector_ImVec2 ImVector_ImVec2;
+typedef struct ImVector_ImDrawIdx ImVector_ImDrawIdx;
+typedef struct ImVector_ImVec4 ImVector_ImVec4;
+typedef struct ImVector_TextRange ImVector_TextRange;
+typedef struct ImVector_ImFontPtr ImVector_ImFontPtr;
+typedef struct ImVector_ImDrawCmd ImVector_ImDrawCmd;
+typedef struct ImVector_ImDrawVert ImVector_ImDrawVert;
+typedef struct ImVector_unsigned_short ImVector_unsigned_short;
+typedef struct ImVector_ImTextureID ImVector_ImTextureID;
+typedef struct ImVector_char ImVector_char;
+typedef struct ImVector_ImDrawChannel ImVector_ImDrawChannel;
+typedef struct ImVector_CustomRect ImVector_CustomRect;
+typedef struct ImVector_Pair ImVector_Pair;
+typedef struct ImVector_unsigned_char ImVector_unsigned_char;
+typedef struct ImVector_ImFontGlyph ImVector_ImFontGlyph;
+typedef struct ImVector_ImFontConfig ImVector_ImFontConfig;
+typedef struct ImVector_ImWchar ImVector_ImWchar;
+typedef struct ImVector_float ImVector_float;
 typedef struct ImVec4 ImVec4;
 typedef struct ImVec2 ImVec2;
 typedef struct ImGuiTextBuffer ImGuiTextBuffer;
@@ -69,6 +87,7 @@ typedef struct ImDrawList ImDrawList;
 typedef struct ImDrawData ImDrawData;
 typedef struct ImDrawCmd ImDrawCmd;
 typedef struct ImDrawChannel ImDrawChannel;
+struct ImDrawChannel;
 struct ImDrawCmd;
 struct ImDrawData;
 struct ImDrawList;
@@ -568,13 +587,25 @@ struct ImGuiIO
    float NavInputsDownDuration[ImGuiNavInput_COUNT];
    float NavInputsDownDurationPrev[ImGuiNavInput_COUNT];
 };
-struct ImVector
-{
-    int Size;
-    int Capacity;
-    void* Data;
-};
-typedef struct ImVector ImVector;
+typedef struct ImVector{int Size;int Capacity;void* Data;} ImVector;
+struct ImVector_float {int Size;int Capacity;float* Data;} ImVector_float;
+struct ImVector_ImWchar {int Size;int Capacity;ImWchar* Data;} ImVector_ImWchar;
+struct ImVector_ImFontConfig {int Size;int Capacity;ImFontConfig* Data;} ImVector_ImFontConfig;
+struct ImVector_ImFontGlyph {int Size;int Capacity;ImFontGlyph* Data;} ImVector_ImFontGlyph;
+struct ImVector_unsigned_char {int Size;int Capacity;unsigned char* Data;} ImVector_unsigned_char;
+struct ImVector_Pair {int Size;int Capacity;Pair* Data;} ImVector_Pair;
+struct ImVector_CustomRect {int Size;int Capacity;CustomRect* Data;} ImVector_CustomRect;
+struct ImVector_ImDrawChannel {int Size;int Capacity;ImDrawChannel* Data;} ImVector_ImDrawChannel;
+struct ImVector_char {int Size;int Capacity;char* Data;} ImVector_char;
+struct ImVector_ImTextureID {int Size;int Capacity;ImTextureID* Data;} ImVector_ImTextureID;
+struct ImVector_unsigned_short {int Size;int Capacity;unsigned short* Data;} ImVector_unsigned_short;
+struct ImVector_ImDrawVert {int Size;int Capacity;ImDrawVert* Data;} ImVector_ImDrawVert;
+struct ImVector_ImDrawCmd {int Size;int Capacity;ImDrawCmd* Data;} ImVector_ImDrawCmd;
+struct ImVector_ImFontPtr {int Size;int Capacity;ImFont** Data;} ImVector_ImFontPtr;
+struct ImVector_TextRange {int Size;int Capacity;TextRange* Data;} ImVector_TextRange;
+struct ImVector_ImVec4 {int Size;int Capacity;ImVec4* Data;} ImVector_ImVec4;
+struct ImVector_ImDrawIdx {int Size;int Capacity;ImDrawIdx* Data;} ImVector_ImDrawIdx;
+struct ImVector_ImVec2 {int Size;int Capacity;ImVec2* Data;} ImVector_ImVec2;
 struct ImNewDummy {};
 struct ImGuiOnceUponAFrame
 {
@@ -583,16 +614,16 @@ struct ImGuiOnceUponAFrame
 struct ImGuiTextFilter
 {
    char InputBuf[256];
-    ImVector/*<TextRange>*/ Filters;
+    ImVector_TextRange Filters;
    int CountGrep;
 };
 struct ImGuiTextBuffer
 {
-    ImVector/*<char>*/ Buf;
+    ImVector_char Buf;
 };
 struct ImGuiStorage
 {
-    ImVector/*<Pair>*/ Data;
+    ImVector_Pair Data;
 };
 struct ImGuiInputTextCallbackData
 {
@@ -646,7 +677,6 @@ struct ImDrawCmd
    ImDrawCallback UserCallback;
    void* UserCallbackData;
 };
-typedef unsigned short ImDrawIdx;
 struct ImDrawVert
 {
    ImVec2 pos;
@@ -655,8 +685,8 @@ struct ImDrawVert
 };
 struct ImDrawChannel
 {
-    ImVector/*<ImDrawCmd>*/ CmdBuffer;
-    ImVector/*<ImDrawIdx>*/ IdxBuffer;
+    ImVector_ImDrawCmd CmdBuffer;
+    ImVector_ImDrawIdx IdxBuffer;
 };
 enum ImDrawCornerFlags_
 {
@@ -677,21 +707,21 @@ enum ImDrawListFlags_
 };
 struct ImDrawList
 {
-    ImVector/*<ImDrawCmd>*/ CmdBuffer;
-    ImVector/*<ImDrawIdx>*/ IdxBuffer;
-    ImVector/*<ImDrawVert>*/ VtxBuffer;
+    ImVector_ImDrawCmd CmdBuffer;
+    ImVector_ImDrawIdx IdxBuffer;
+    ImVector_ImDrawVert VtxBuffer;
    ImDrawListFlags Flags;
    const ImDrawListSharedData* _Data;
    const char* _OwnerName;
    unsigned int _VtxCurrentIdx;
    ImDrawVert* _VtxWritePtr;
    ImDrawIdx* _IdxWritePtr;
-    ImVector/*<ImVec4>*/ _ClipRectStack;
-    ImVector/*<ImTextureID>*/ _TextureIdStack;
-    ImVector/*<ImVec2>*/ _Path;
+    ImVector_ImVec4 _ClipRectStack;
+    ImVector_ImTextureID _TextureIdStack;
+    ImVector_ImVec2 _Path;
    int _ChannelsCurrent;
    int _ChannelsCount;
-    ImVector/*<ImDrawChannel>*/ _Channels;
+    ImVector_ImDrawChannel _Channels;
 };
 struct ImDrawData
 {
@@ -750,9 +780,9 @@ struct ImFontAtlas
    int TexHeight;
    ImVec2 TexUvScale;
    ImVec2 TexUvWhitePixel;
-    ImVector/*<ImFont*>*/ Fonts;
-    ImVector/*<CustomRect>*/ CustomRects;
-    ImVector/*<ImFontConfig>*/ ConfigData;
+    ImVector_ImFontPtr Fonts;
+    ImVector_CustomRect CustomRects;
+    ImVector_ImFontConfig ConfigData;
    int CustomRectIds[1];
 };
 struct ImFont
@@ -760,9 +790,9 @@ struct ImFont
    float FontSize;
    float Scale;
    ImVec2 DisplayOffset;
-    ImVector/*<ImFontGlyph>*/ Glyphs;
-    ImVector/*<float>*/ IndexAdvanceX;
-    ImVector/*<unsigned short>*/ IndexLookup;
+    ImVector_ImFontGlyph Glyphs;
+    ImVector_float IndexAdvanceX;
+    ImVector_unsigned_short IndexLookup;
    const ImFontGlyph* FallbackGlyph;
    float FallbackAdvanceX;
    ImWchar FallbackChar;
@@ -775,7 +805,7 @@ struct ImFont
 };
    struct GlyphRangesBuilder
    {
-        ImVector/*<unsigned char>*/ UsedChars;
+        ImVector_unsigned_char UsedChars;
    };
    struct CustomRect
    {
@@ -832,10 +862,13 @@ typedef ImGuiTextFilter::TextRange TextRange;
 typedef ImGuiStorage::Pair Pair;
 typedef ImVector<TextRange> ImVector_TextRange;
 typedef ImVector<ImWchar> ImVector_ImWchar;
-#else //CIMGUI_DEFINE_ENUMS_AND_STRUCTS
-typedef ImVector ImVector_TextRange;
-typedef ImVector ImVector_ImWchar;
 #endif //CIMGUI_DEFINE_ENUMS_AND_STRUCTS
+CIMGUI_API ImVec2* ImVec2_ImVec2(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 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);
 CIMGUI_API void igDestroyContext(ImGuiContext* ctx);
 CIMGUI_API ImGuiContext* igGetCurrentContext(void);
@@ -1169,19 +1202,31 @@ CIMGUI_API const char* igSaveIniSettingsToMemory(size_t* out_ini_size);
 CIMGUI_API void igSetAllocatorFunctions(void*(*alloc_func)(size_t sz,void* user_data),void(*free_func)(void* ptr,void* user_data),void* user_data);
 CIMGUI_API void* igMemAlloc(size_t size);
 CIMGUI_API void igMemFree(void* ptr);
+CIMGUI_API ImGuiStyle* ImGuiStyle_ImGuiStyle(void);
+CIMGUI_API void ImGuiStyle_destroy(ImGuiStyle* self);
 CIMGUI_API void ImGuiStyle_ScaleAllSizes(ImGuiStyle* self,float scale_factor);
 CIMGUI_API void ImGuiIO_AddInputCharacter(ImGuiIO* self,ImWchar c);
 CIMGUI_API void ImGuiIO_AddInputCharactersUTF8(ImGuiIO* self,const char* utf8_chars);
 CIMGUI_API void ImGuiIO_ClearInputCharacters(ImGuiIO* self);
+CIMGUI_API ImGuiIO* ImGuiIO_ImGuiIO(void);
+CIMGUI_API void ImGuiIO_destroy(ImGuiIO* self);
+CIMGUI_API ImGuiOnceUponAFrame* ImGuiOnceUponAFrame_ImGuiOnceUponAFrame(void);
+CIMGUI_API void ImGuiOnceUponAFrame_destroy(ImGuiOnceUponAFrame* self);
+CIMGUI_API ImGuiTextFilter* ImGuiTextFilter_ImGuiTextFilter(const char* default_filter);
 CIMGUI_API bool ImGuiTextFilter_Draw(ImGuiTextFilter* self,const char* label,float width);
 CIMGUI_API bool ImGuiTextFilter_PassFilter(ImGuiTextFilter* self,const char* text,const char* text_end);
 CIMGUI_API void ImGuiTextFilter_Build(ImGuiTextFilter* self);
 CIMGUI_API void ImGuiTextFilter_Clear(ImGuiTextFilter* self);
 CIMGUI_API bool ImGuiTextFilter_IsActive(ImGuiTextFilter* self);
+CIMGUI_API TextRange* TextRange_TextRange(void);
+CIMGUI_API void TextRange_destroy(TextRange* self);
+CIMGUI_API TextRange* TextRange_TextRangeStr(const char* _b,const char* _e);
 CIMGUI_API const char* TextRange_begin(TextRange* self);
 CIMGUI_API const char* TextRange_end(TextRange* self);
 CIMGUI_API bool TextRange_empty(TextRange* self);
 CIMGUI_API void TextRange_split(TextRange* self,char separator,ImVector_TextRange* out);
+CIMGUI_API ImGuiTextBuffer* ImGuiTextBuffer_ImGuiTextBuffer(void);
+CIMGUI_API void ImGuiTextBuffer_destroy(ImGuiTextBuffer* self);
 CIMGUI_API const char* ImGuiTextBuffer_begin(ImGuiTextBuffer* self);
 CIMGUI_API const char* ImGuiTextBuffer_end(ImGuiTextBuffer* self);
 CIMGUI_API int ImGuiTextBuffer_size(ImGuiTextBuffer* self);
@@ -1190,6 +1235,9 @@ CIMGUI_API void ImGuiTextBuffer_clear(ImGuiTextBuffer* self);
 CIMGUI_API void ImGuiTextBuffer_reserve(ImGuiTextBuffer* self,int capacity);
 CIMGUI_API const char* ImGuiTextBuffer_c_str(ImGuiTextBuffer* self);
 CIMGUI_API void ImGuiTextBuffer_appendfv(ImGuiTextBuffer* self,const char* fmt,va_list args);
+CIMGUI_API Pair* Pair_PairInt(ImGuiID _key,int _val_i);
+CIMGUI_API Pair* Pair_PairFloat(ImGuiID _key,float _val_f);
+CIMGUI_API Pair* Pair_PairPtr(ImGuiID _key,void* _val_p);
 CIMGUI_API void ImGuiStorage_Clear(ImGuiStorage* self);
 CIMGUI_API int ImGuiStorage_GetInt(ImGuiStorage* self,ImGuiID key,int default_val);
 CIMGUI_API void ImGuiStorage_SetInt(ImGuiStorage* self,ImGuiID key,int val);
@@ -1205,18 +1253,32 @@ CIMGUI_API float* ImGuiStorage_GetFloatRef(ImGuiStorage* self,ImGuiID key,float
 CIMGUI_API void** ImGuiStorage_GetVoidPtrRef(ImGuiStorage* self,ImGuiID key,void* default_val);
 CIMGUI_API void ImGuiStorage_SetAllInt(ImGuiStorage* self,int val);
 CIMGUI_API void ImGuiStorage_BuildSortByKey(ImGuiStorage* self);
+CIMGUI_API ImGuiInputTextCallbackData* ImGuiInputTextCallbackData_ImGuiInputTextCallbackData(void);
+CIMGUI_API void ImGuiInputTextCallbackData_destroy(ImGuiInputTextCallbackData* self);
 CIMGUI_API void ImGuiInputTextCallbackData_DeleteChars(ImGuiInputTextCallbackData* self,int pos,int bytes_count);
 CIMGUI_API void ImGuiInputTextCallbackData_InsertChars(ImGuiInputTextCallbackData* self,int pos,const char* text,const char* text_end);
 CIMGUI_API bool ImGuiInputTextCallbackData_HasSelection(ImGuiInputTextCallbackData* self);
+CIMGUI_API ImGuiPayload* ImGuiPayload_ImGuiPayload(void);
+CIMGUI_API void ImGuiPayload_destroy(ImGuiPayload* self);
 CIMGUI_API void ImGuiPayload_Clear(ImGuiPayload* self);
 CIMGUI_API bool ImGuiPayload_IsDataType(ImGuiPayload* self,const char* type);
 CIMGUI_API bool ImGuiPayload_IsPreview(ImGuiPayload* self);
 CIMGUI_API bool ImGuiPayload_IsDelivery(ImGuiPayload* self);
+CIMGUI_API ImColor* ImColor_ImColor(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 ImGuiListClipper* ImGuiListClipper_ImGuiListClipper(int items_count,float items_height);
 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 ImDrawCmd* ImDrawCmd_ImDrawCmd(void);
+CIMGUI_API void ImDrawCmd_destroy(ImDrawCmd* self);
+CIMGUI_API ImDrawList* ImDrawList_ImDrawList(const ImDrawListSharedData* shared_data);
 CIMGUI_API void ImDrawList_PushClipRect(ImDrawList* self,ImVec2 clip_rect_min,ImVec2 clip_rect_max,bool intersect_with_current_clip_rect);
 CIMGUI_API void ImDrawList_PushClipRectFullScreen(ImDrawList* self);
 CIMGUI_API void ImDrawList_PopClipRect(ImDrawList* self);
@@ -1268,9 +1330,15 @@ CIMGUI_API void ImDrawList_PrimWriteIdx(ImDrawList* self,ImDrawIdx idx);
 CIMGUI_API void ImDrawList_PrimVtx(ImDrawList* self,const ImVec2 pos,const ImVec2 uv,ImU32 col);
 CIMGUI_API void ImDrawList_UpdateClipRect(ImDrawList* self);
 CIMGUI_API void ImDrawList_UpdateTextureID(ImDrawList* self);
+CIMGUI_API ImDrawData* ImDrawData_ImDrawData(void);
+CIMGUI_API void ImDrawData_destroy(ImDrawData* self);
 CIMGUI_API void ImDrawData_Clear(ImDrawData* self);
 CIMGUI_API void ImDrawData_DeIndexAllBuffers(ImDrawData* self);
 CIMGUI_API void ImDrawData_ScaleClipRects(ImDrawData* self,const ImVec2 sc);
+CIMGUI_API ImFontConfig* ImFontConfig_ImFontConfig(void);
+CIMGUI_API void ImFontConfig_destroy(ImFontConfig* self);
+CIMGUI_API ImFontAtlas* ImFontAtlas_ImFontAtlas(void);
+CIMGUI_API void ImFontAtlas_destroy(ImFontAtlas* self);
 CIMGUI_API ImFont* ImFontAtlas_AddFont(ImFontAtlas* self,const ImFontConfig* font_cfg);
 CIMGUI_API ImFont* ImFontAtlas_AddFontDefault(ImFontAtlas* self,const ImFontConfig* font_cfg);
 CIMGUI_API ImFont* ImFontAtlas_AddFontFromFileTTF(ImFontAtlas* self,const char* filename,float size_pixels,const ImFontConfig* font_cfg,const ImWchar* glyph_ranges);
@@ -1293,18 +1361,24 @@ CIMGUI_API const ImWchar* ImFontAtlas_GetGlyphRangesChineseFull(ImFontAtlas* sel
 CIMGUI_API const ImWchar* ImFontAtlas_GetGlyphRangesChineseSimplifiedCommon(ImFontAtlas* self);
 CIMGUI_API const ImWchar* ImFontAtlas_GetGlyphRangesCyrillic(ImFontAtlas* self);
 CIMGUI_API const ImWchar* ImFontAtlas_GetGlyphRangesThai(ImFontAtlas* self);
+CIMGUI_API GlyphRangesBuilder* GlyphRangesBuilder_GlyphRangesBuilder(void);
+CIMGUI_API void GlyphRangesBuilder_destroy(GlyphRangesBuilder* self);
 CIMGUI_API bool GlyphRangesBuilder_GetBit(GlyphRangesBuilder* self,int n);
 CIMGUI_API void GlyphRangesBuilder_SetBit(GlyphRangesBuilder* self,int n);
 CIMGUI_API void GlyphRangesBuilder_AddChar(GlyphRangesBuilder* self,ImWchar c);
 CIMGUI_API void GlyphRangesBuilder_AddText(GlyphRangesBuilder* self,const char* text,const char* text_end);
 CIMGUI_API void GlyphRangesBuilder_AddRanges(GlyphRangesBuilder* self,const ImWchar* ranges);
 CIMGUI_API void GlyphRangesBuilder_BuildRanges(GlyphRangesBuilder* self,ImVector_ImWchar* out_ranges);
+CIMGUI_API CustomRect* CustomRect_CustomRect(void);
+CIMGUI_API void CustomRect_destroy(CustomRect* self);
 CIMGUI_API bool CustomRect_IsPacked(CustomRect* self);
 CIMGUI_API int ImFontAtlas_AddCustomRectRegular(ImFontAtlas* self,unsigned int id,int width,int height);
 CIMGUI_API int ImFontAtlas_AddCustomRectFontGlyph(ImFontAtlas* self,ImFont* font,ImWchar id,int width,int height,float advance_x,const ImVec2 offset);
 CIMGUI_API const CustomRect* ImFontAtlas_GetCustomRectByIndex(ImFontAtlas* self,int index);
 CIMGUI_API void ImFontAtlas_CalcCustomRectUV(ImFontAtlas* self,const CustomRect* rect,ImVec2* out_uv_min,ImVec2* out_uv_max);
 CIMGUI_API bool ImFontAtlas_GetMouseCursorTexData(ImFontAtlas* self,ImGuiMouseCursor cursor,ImVec2* out_offset,ImVec2* out_size,ImVec2 out_uv_border[2],ImVec2 out_uv_fill[2]);
+CIMGUI_API ImFont* ImFont_ImFont(void);
+CIMGUI_API void ImFont_destroy(ImFont* self);
 CIMGUI_API void ImFont_ClearOutputData(ImFont* self);
 CIMGUI_API void ImFont_BuildLookupTable(ImFont* self);
 CIMGUI_API const ImFontGlyph* ImFont_FindGlyph(ImFont* self,ImWchar c);
@@ -1371,12 +1445,17 @@ CIMGUI_API ImVec2_Simple ImFont_CalcTextSizeA_nonUDT2(ImFont* self,float size,fl
 CIMGUI_API void igLogText(CONST char *fmt, ...);
 //no appendfV
 CIMGUI_API void ImGuiTextBuffer_appendf(struct ImGuiTextBuffer *buffer, const char *fmt, ...);
-CIMGUI_API void ImFontConfig_DefaultConstructor(ImFontConfig *config);
 //for getting FLT_MAX in bindings
 CIMGUI_API float igGET_FLT_MAX();
 //not const args from & to *
 CIMGUI_API void igColorConvertRGBtoHSV(float r,float g,float b,float *out_h,float *out_s,float *out_v);
 CIMGUI_API void igColorConvertHSVtoRGB(float h,float s,float v,float *out_r,float *out_g,float *out_b);

+CIMGUI_API ImVector_ImWchar* ImVector_ImWchar_create();
+CIMGUI_API void ImVector_ImWchar_destroy(ImVector_ImWchar* p);
+CIMGUI_API void ImVector_ImWchar_Init(ImVector_ImWchar* p);
+CIMGUI_API void ImVector_ImWchar_UnInit(ImVector_ImWchar* p);
+
+


--- a/generator/output/cimgui_impl.h
+++ b/generator/output/cimgui_impl.h
@@ -1,6 +1,6 @@
-struct GLFWwindow;
 typedef struct SDL_Window SDL_Window;
 typedef struct GLFWwindow GLFWwindow;
+struct GLFWwindow;
 struct SDL_Window;
 typedef union SDL_Event SDL_Event;
 CIMGUI_API bool ImGui_ImplGlfw_InitForOpenGL(GLFWwindow* window,bool install_callbacks);
--- a/generator/output/structs_and_enums.json
+++ b/generator/output/structs_and_enums.json
--- a/generator/output/structs_and_enums.lua
+++ b/generator/output/structs_and_enums.lua
@@ -1191,13 +1191,16 @@ defs["structs"]["ImDrawVert"][3]["type"] = "ImU32"
 defs["structs"]["ImDrawVert"][3]["name"] = "col"
 defs["structs"]["ImDrawList"] = {}
 defs["structs"]["ImDrawList"][1] = {}
-defs["structs"]["ImDrawList"][1]["type"] = "ImVector/*<ImDrawCmd>*/"
+defs["structs"]["ImDrawList"][1]["type"] = "ImVector"
+defs["structs"]["ImDrawList"][1]["template_type"] = "ImDrawCmd"
 defs["structs"]["ImDrawList"][1]["name"] = "CmdBuffer"
 defs["structs"]["ImDrawList"][2] = {}
-defs["structs"]["ImDrawList"][2]["type"] = "ImVector/*<ImDrawIdx>*/"
+defs["structs"]["ImDrawList"][2]["type"] = "ImVector"
+defs["structs"]["ImDrawList"][2]["template_type"] = "ImDrawIdx"
 defs["structs"]["ImDrawList"][2]["name"] = "IdxBuffer"
 defs["structs"]["ImDrawList"][3] = {}
-defs["structs"]["ImDrawList"][3]["type"] = "ImVector/*<ImDrawVert>*/"
+defs["structs"]["ImDrawList"][3]["type"] = "ImVector"
+defs["structs"]["ImDrawList"][3]["template_type"] = "ImDrawVert"
 defs["structs"]["ImDrawList"][3]["name"] = "VtxBuffer"
 defs["structs"]["ImDrawList"][4] = {}
 defs["structs"]["ImDrawList"][4]["type"] = "ImDrawListFlags"
@@ -1218,13 +1221,16 @@ defs["structs"]["ImDrawList"][9] = {}
 defs["structs"]["ImDrawList"][9]["type"] = "ImDrawIdx*"
 defs["structs"]["ImDrawList"][9]["name"] = "_IdxWritePtr"
 defs["structs"]["ImDrawList"][10] = {}
-defs["structs"]["ImDrawList"][10]["type"] = "ImVector/*<ImVec4>*/"
+defs["structs"]["ImDrawList"][10]["type"] = "ImVector"
+defs["structs"]["ImDrawList"][10]["template_type"] = "ImVec4"
 defs["structs"]["ImDrawList"][10]["name"] = "_ClipRectStack"
 defs["structs"]["ImDrawList"][11] = {}
-defs["structs"]["ImDrawList"][11]["type"] = "ImVector/*<ImTextureID>*/"
+defs["structs"]["ImDrawList"][11]["type"] = "ImVector"
+defs["structs"]["ImDrawList"][11]["template_type"] = "ImTextureID"
 defs["structs"]["ImDrawList"][11]["name"] = "_TextureIdStack"
 defs["structs"]["ImDrawList"][12] = {}
-defs["structs"]["ImDrawList"][12]["type"] = "ImVector/*<ImVec2>*/"
+defs["structs"]["ImDrawList"][12]["type"] = "ImVector"
+defs["structs"]["ImDrawList"][12]["template_type"] = "ImVec2"
 defs["structs"]["ImDrawList"][12]["name"] = "_Path"
 defs["structs"]["ImDrawList"][13] = {}
 defs["structs"]["ImDrawList"][13]["type"] = "int"
@@ -1233,7 +1239,8 @@ defs["structs"]["ImDrawList"][14] = {}
 defs["structs"]["ImDrawList"][14]["type"] = "int"
 defs["structs"]["ImDrawList"][14]["name"] = "_ChannelsCount"
 defs["structs"]["ImDrawList"][15] = {}
-defs["structs"]["ImDrawList"][15]["type"] = "ImVector/*<ImDrawChannel>*/"
+defs["structs"]["ImDrawList"][15]["type"] = "ImVector"
+defs["structs"]["ImDrawList"][15]["template_type"] = "ImDrawChannel"
 defs["structs"]["ImDrawList"][15]["name"] = "_Channels"
 defs["structs"]["Pair"] = {}
 defs["structs"]["Pair"][1] = {}
@@ -1253,13 +1260,16 @@ defs["structs"]["ImFont"][3] = {}
 defs["structs"]["ImFont"][3]["type"] = "ImVec2"
 defs["structs"]["ImFont"][3]["name"] = "DisplayOffset"
 defs["structs"]["ImFont"][4] = {}
-defs["structs"]["ImFont"][4]["type"] = "ImVector/*<ImFontGlyph>*/"
+defs["structs"]["ImFont"][4]["type"] = "ImVector"
+defs["structs"]["ImFont"][4]["template_type"] = "ImFontGlyph"
 defs["structs"]["ImFont"][4]["name"] = "Glyphs"
 defs["structs"]["ImFont"][5] = {}
-defs["structs"]["ImFont"][5]["type"] = "ImVector/*<float>*/"
+defs["structs"]["ImFont"][5]["type"] = "ImVector"
+defs["structs"]["ImFont"][5]["template_type"] = "float"
 defs["structs"]["ImFont"][5]["name"] = "IndexAdvanceX"
 defs["structs"]["ImFont"][6] = {}
-defs["structs"]["ImFont"][6]["type"] = "ImVector/*<unsigned short>*/"
+defs["structs"]["ImFont"][6]["type"] = "ImVector"
+defs["structs"]["ImFont"][6]["template_type"] = "unsigned short"
 defs["structs"]["ImFont"][6]["name"] = "IndexLookup"
 defs["structs"]["ImFont"][7] = {}
 defs["structs"]["ImFont"][7]["type"] = "const ImFontGlyph*"
@@ -1350,11 +1360,13 @@ defs["structs"]["ImVec4"][4]["type"] = "float"
 defs["structs"]["ImVec4"][4]["name"] = "w"
 defs["structs"]["GlyphRangesBuilder"] = {}
 defs["structs"]["GlyphRangesBuilder"][1] = {}
-defs["structs"]["GlyphRangesBuilder"][1]["type"] = "ImVector/*<unsigned char>*/"
+defs["structs"]["GlyphRangesBuilder"][1]["type"] = "ImVector"
+defs["structs"]["GlyphRangesBuilder"][1]["template_type"] = "unsigned char"
 defs["structs"]["GlyphRangesBuilder"][1]["name"] = "UsedChars"
 defs["structs"]["ImGuiStorage"] = {}
 defs["structs"]["ImGuiStorage"][1] = {}
-defs["structs"]["ImGuiStorage"][1]["type"] = "ImVector/*<Pair>*/"
+defs["structs"]["ImGuiStorage"][1]["type"] = "ImVector"
+defs["structs"]["ImGuiStorage"][1]["template_type"] = "Pair"
 defs["structs"]["ImGuiStorage"][1]["name"] = "Data"
 defs["structs"]["ImFontAtlas"] = {}
 defs["structs"]["ImFontAtlas"][1] = {}
@@ -1391,18 +1403,21 @@ defs["structs"]["ImFontAtlas"][11] = {}
 defs["structs"]["ImFontAtlas"][11]["type"] = "ImVec2"
 defs["structs"]["ImFontAtlas"][11]["name"] = "TexUvWhitePixel"
 defs["structs"]["ImFontAtlas"][12] = {}
-defs["structs"]["ImFontAtlas"][12]["type"] = "ImVector/*<ImFont*>*/"
+defs["structs"]["ImFontAtlas"][12]["type"] = "ImVector"
+defs["structs"]["ImFontAtlas"][12]["template_type"] = "ImFont*"
 defs["structs"]["ImFontAtlas"][12]["name"] = "Fonts"
 defs["structs"]["ImFontAtlas"][13] = {}
-defs["structs"]["ImFontAtlas"][13]["type"] = "ImVector/*<CustomRect>*/"
+defs["structs"]["ImFontAtlas"][13]["type"] = "ImVector"
+defs["structs"]["ImFontAtlas"][13]["template_type"] = "CustomRect"
 defs["structs"]["ImFontAtlas"][13]["name"] = "CustomRects"
 defs["structs"]["ImFontAtlas"][14] = {}
-defs["structs"]["ImFontAtlas"][14]["type"] = "ImVector/*<ImFontConfig>*/"
+defs["structs"]["ImFontAtlas"][14]["type"] = "ImVector"
+defs["structs"]["ImFontAtlas"][14]["template_type"] = "ImFontConfig"
 defs["structs"]["ImFontAtlas"][14]["name"] = "ConfigData"
 defs["structs"]["ImFontAtlas"][15] = {}
 defs["structs"]["ImFontAtlas"][15]["type"] = "int"
-defs["structs"]["ImFontAtlas"][15]["name"] = "CustomRectIds[1]"
 defs["structs"]["ImFontAtlas"][15]["size"] = 1
+defs["structs"]["ImFontAtlas"][15]["name"] = "CustomRectIds[1]"
 defs["structs"]["ImFontGlyph"] = {}
 defs["structs"]["ImFontGlyph"][1] = {}
 defs["structs"]["ImFontGlyph"][1]["type"] = "ImWchar"
@@ -1485,8 +1500,8 @@ defs["structs"]["ImFontConfig"][16]["type"] = "float"
 defs["structs"]["ImFontConfig"][16]["name"] = "RasterizerMultiply"
 defs["structs"]["ImFontConfig"][17] = {}
 defs["structs"]["ImFontConfig"][17]["type"] = "char"
-defs["structs"]["ImFontConfig"][17]["name"] = "Name[40]"
 defs["structs"]["ImFontConfig"][17]["size"] = 40
+defs["structs"]["ImFontConfig"][17]["name"] = "Name[40]"
 defs["structs"]["ImFontConfig"][18] = {}
 defs["structs"]["ImFontConfig"][18]["type"] = "ImFont*"
 defs["structs"]["ImFontConfig"][18]["name"] = "DstFont"
@@ -1514,7 +1529,8 @@ defs["structs"]["ImDrawData"][7]["type"] = "ImVec2"
 defs["structs"]["ImDrawData"][7]["name"] = "DisplaySize"
 defs["structs"]["ImGuiTextBuffer"] = {}
 defs["structs"]["ImGuiTextBuffer"][1] = {}
-defs["structs"]["ImGuiTextBuffer"][1]["type"] = "ImVector/*<char>*/"
+defs["structs"]["ImGuiTextBuffer"][1]["type"] = "ImVector"
+defs["structs"]["ImGuiTextBuffer"][1]["template_type"] = "char"
 defs["structs"]["ImGuiTextBuffer"][1]["name"] = "Buf"
 defs["structs"]["ImGuiStyle"] = {}
 defs["structs"]["ImGuiStyle"][1] = {}
@@ -1606,14 +1622,16 @@ defs["structs"]["ImGuiStyle"][29]["type"] = "float"
 defs["structs"]["ImGuiStyle"][29]["name"] = "CurveTessellationTol"
 defs["structs"]["ImGuiStyle"][30] = {}
 defs["structs"]["ImGuiStyle"][30]["type"] = "ImVec4"
-defs["structs"]["ImGuiStyle"][30]["name"] = "Colors[ImGuiCol_COUNT]"
 defs["structs"]["ImGuiStyle"][30]["size"] = 43
+defs["structs"]["ImGuiStyle"][30]["name"] = "Colors[ImGuiCol_COUNT]"
 defs["structs"]["ImDrawChannel"] = {}
 defs["structs"]["ImDrawChannel"][1] = {}
-defs["structs"]["ImDrawChannel"][1]["type"] = "ImVector/*<ImDrawCmd>*/"
+defs["structs"]["ImDrawChannel"][1]["type"] = "ImVector"
+defs["structs"]["ImDrawChannel"][1]["template_type"] = "ImDrawCmd"
 defs["structs"]["ImDrawChannel"][1]["name"] = "CmdBuffer"
 defs["structs"]["ImDrawChannel"][2] = {}
-defs["structs"]["ImDrawChannel"][2]["type"] = "ImVector/*<ImDrawIdx>*/"
+defs["structs"]["ImDrawChannel"][2]["type"] = "ImVector"
+defs["structs"]["ImDrawChannel"][2]["template_type"] = "ImDrawIdx"
 defs["structs"]["ImDrawChannel"][2]["name"] = "IdxBuffer"
 defs["structs"]["ImDrawCmd"] = {}
 defs["structs"]["ImDrawCmd"][1] = {}
@@ -1676,8 +1694,8 @@ defs["structs"]["ImGuiIO"][10]["type"] = "float"
 defs["structs"]["ImGuiIO"][10]["name"] = "MouseDragThreshold"
 defs["structs"]["ImGuiIO"][11] = {}
 defs["structs"]["ImGuiIO"][11]["type"] = "int"
-defs["structs"]["ImGuiIO"][11]["name"] = "KeyMap[ImGuiKey_COUNT]"
 defs["structs"]["ImGuiIO"][11]["size"] = 21
+defs["structs"]["ImGuiIO"][11]["name"] = "KeyMap[ImGuiKey_COUNT]"
 defs["structs"]["ImGuiIO"][12] = {}
 defs["structs"]["ImGuiIO"][12]["type"] = "float"
 defs["structs"]["ImGuiIO"][12]["name"] = "KeyRepeatDelay"
@@ -1743,8 +1761,8 @@ defs["structs"]["ImGuiIO"][32]["type"] = "ImVec2"
 defs["structs"]["ImGuiIO"][32]["name"] = "MousePos"
 defs["structs"]["ImGuiIO"][33] = {}
 defs["structs"]["ImGuiIO"][33]["type"] = "bool"
-defs["structs"]["ImGuiIO"][33]["name"] = "MouseDown[5]"
 defs["structs"]["ImGuiIO"][33]["size"] = 5
+defs["structs"]["ImGuiIO"][33]["name"] = "MouseDown[5]"
 defs["structs"]["ImGuiIO"][34] = {}
 defs["structs"]["ImGuiIO"][34]["type"] = "float"
 defs["structs"]["ImGuiIO"][34]["name"] = "MouseWheel"
@@ -1765,16 +1783,16 @@ defs["structs"]["ImGuiIO"][39]["type"] = "bool"
 defs["structs"]["ImGuiIO"][39]["name"] = "KeySuper"
 defs["structs"]["ImGuiIO"][40] = {}
 defs["structs"]["ImGuiIO"][40]["type"] = "bool"
-defs["structs"]["ImGuiIO"][40]["name"] = "KeysDown[512]"
 defs["structs"]["ImGuiIO"][40]["size"] = 512
+defs["structs"]["ImGuiIO"][40]["name"] = "KeysDown[512]"
 defs["structs"]["ImGuiIO"][41] = {}
 defs["structs"]["ImGuiIO"][41]["type"] = "ImWchar"
-defs["structs"]["ImGuiIO"][41]["name"] = "InputCharacters[16+1]"
 defs["structs"]["ImGuiIO"][41]["size"] = 17
+defs["structs"]["ImGuiIO"][41]["name"] = "InputCharacters[16+1]"
 defs["structs"]["ImGuiIO"][42] = {}
 defs["structs"]["ImGuiIO"][42]["type"] = "float"
-defs["structs"]["ImGuiIO"][42]["name"] = "NavInputs[ImGuiNavInput_COUNT]"
 defs["structs"]["ImGuiIO"][42]["size"] = 21
+defs["structs"]["ImGuiIO"][42]["name"] = "NavInputs[ImGuiNavInput_COUNT]"
 defs["structs"]["ImGuiIO"][43] = {}
 defs["structs"]["ImGuiIO"][43]["type"] = "bool"
 defs["structs"]["ImGuiIO"][43]["name"] = "WantCaptureMouse"
@@ -1822,60 +1840,60 @@ defs["structs"]["ImGuiIO"][57]["type"] = "ImVec2"
 defs["structs"]["ImGuiIO"][57]["name"] = "MousePosPrev"
 defs["structs"]["ImGuiIO"][58] = {}
 defs["structs"]["ImGuiIO"][58]["type"] = "ImVec2"
-defs["structs"]["ImGuiIO"][58]["name"] = "MouseClickedPos[5]"
 defs["structs"]["ImGuiIO"][58]["size"] = 5
+defs["structs"]["ImGuiIO"][58]["name"] = "MouseClickedPos[5]"
 defs["structs"]["ImGuiIO"][59] = {}
 defs["structs"]["ImGuiIO"][59]["type"] = "double"
-defs["structs"]["ImGuiIO"][59]["name"] = "MouseClickedTime[5]"
 defs["structs"]["ImGuiIO"][59]["size"] = 5
+defs["structs"]["ImGuiIO"][59]["name"] = "MouseClickedTime[5]"
 defs["structs"]["ImGuiIO"][60] = {}
 defs["structs"]["ImGuiIO"][60]["type"] = "bool"
-defs["structs"]["ImGuiIO"][60]["name"] = "MouseClicked[5]"
 defs["structs"]["ImGuiIO"][60]["size"] = 5
+defs["structs"]["ImGuiIO"][60]["name"] = "MouseClicked[5]"
 defs["structs"]["ImGuiIO"][61] = {}
 defs["structs"]["ImGuiIO"][61]["type"] = "bool"
-defs["structs"]["ImGuiIO"][61]["name"] = "MouseDoubleClicked[5]"
 defs["structs"]["ImGuiIO"][61]["size"] = 5
+defs["structs"]["ImGuiIO"][61]["name"] = "MouseDoubleClicked[5]"
 defs["structs"]["ImGuiIO"][62] = {}
 defs["structs"]["ImGuiIO"][62]["type"] = "bool"
-defs["structs"]["ImGuiIO"][62]["name"] = "MouseReleased[5]"
 defs["structs"]["ImGuiIO"][62]["size"] = 5
+defs["structs"]["ImGuiIO"][62]["name"] = "MouseReleased[5]"
 defs["structs"]["ImGuiIO"][63] = {}
 defs["structs"]["ImGuiIO"][63]["type"] = "bool"
-defs["structs"]["ImGuiIO"][63]["name"] = "MouseDownOwned[5]"
 defs["structs"]["ImGuiIO"][63]["size"] = 5
+defs["structs"]["ImGuiIO"][63]["name"] = "MouseDownOwned[5]"
 defs["structs"]["ImGuiIO"][64] = {}
 defs["structs"]["ImGuiIO"][64]["type"] = "float"
-defs["structs"]["ImGuiIO"][64]["name"] = "MouseDownDuration[5]"
 defs["structs"]["ImGuiIO"][64]["size"] = 5
+defs["structs"]["ImGuiIO"][64]["name"] = "MouseDownDuration[5]"
 defs["structs"]["ImGuiIO"][65] = {}
 defs["structs"]["ImGuiIO"][65]["type"] = "float"
-defs["structs"]["ImGuiIO"][65]["name"] = "MouseDownDurationPrev[5]"
 defs["structs"]["ImGuiIO"][65]["size"] = 5
+defs["structs"]["ImGuiIO"][65]["name"] = "MouseDownDurationPrev[5]"
 defs["structs"]["ImGuiIO"][66] = {}
 defs["structs"]["ImGuiIO"][66]["type"] = "ImVec2"
-defs["structs"]["ImGuiIO"][66]["name"] = "MouseDragMaxDistanceAbs[5]"
 defs["structs"]["ImGuiIO"][66]["size"] = 5
+defs["structs"]["ImGuiIO"][66]["name"] = "MouseDragMaxDistanceAbs[5]"
 defs["structs"]["ImGuiIO"][67] = {}
 defs["structs"]["ImGuiIO"][67]["type"] = "float"
-defs["structs"]["ImGuiIO"][67]["name"] = "MouseDragMaxDistanceSqr[5]"
 defs["structs"]["ImGuiIO"][67]["size"] = 5
+defs["structs"]["ImGuiIO"][67]["name"] = "MouseDragMaxDistanceSqr[5]"
 defs["structs"]["ImGuiIO"][68] = {}
 defs["structs"]["ImGuiIO"][68]["type"] = "float"
-defs["structs"]["ImGuiIO"][68]["name"] = "KeysDownDuration[512]"
 defs["structs"]["ImGuiIO"][68]["size"] = 512
+defs["structs"]["ImGuiIO"][68]["name"] = "KeysDownDuration[512]"
 defs["structs"]["ImGuiIO"][69] = {}
 defs["structs"]["ImGuiIO"][69]["type"] = "float"
-defs["structs"]["ImGuiIO"][69]["name"] = "KeysDownDurationPrev[512]"
 defs["structs"]["ImGuiIO"][69]["size"] = 512
+defs["structs"]["ImGuiIO"][69]["name"] = "KeysDownDurationPrev[512]"
 defs["structs"]["ImGuiIO"][70] = {}
 defs["structs"]["ImGuiIO"][70]["type"] = "float"
-defs["structs"]["ImGuiIO"][70]["name"] = "NavInputsDownDuration[ImGuiNavInput_COUNT]"
 defs["structs"]["ImGuiIO"][70]["size"] = 21
+defs["structs"]["ImGuiIO"][70]["name"] = "NavInputsDownDuration[ImGuiNavInput_COUNT]"
 defs["structs"]["ImGuiIO"][71] = {}
 defs["structs"]["ImGuiIO"][71]["type"] = "float"
-defs["structs"]["ImGuiIO"][71]["name"] = "NavInputsDownDurationPrev[ImGuiNavInput_COUNT]"
 defs["structs"]["ImGuiIO"][71]["size"] = 21
+defs["structs"]["ImGuiIO"][71]["name"] = "NavInputsDownDurationPrev[ImGuiNavInput_COUNT]"
 defs["structs"]["ImGuiPayload"] = {}
 defs["structs"]["ImGuiPayload"][1] = {}
 defs["structs"]["ImGuiPayload"][1]["type"] = "void*"
@@ -1894,8 +1912,8 @@ defs["structs"]["ImGuiPayload"][5]["type"] = "int"
 defs["structs"]["ImGuiPayload"][5]["name"] = "DataFrameCount"
 defs["structs"]["ImGuiPayload"][6] = {}
 defs["structs"]["ImGuiPayload"][6]["type"] = "char"
-defs["structs"]["ImGuiPayload"][6]["name"] = "DataType[32+1]"
 defs["structs"]["ImGuiPayload"][6]["size"] = 33
+defs["structs"]["ImGuiPayload"][6]["name"] = "DataType[32+1]"
 defs["structs"]["ImGuiPayload"][7] = {}
 defs["structs"]["ImGuiPayload"][7]["type"] = "bool"
 defs["structs"]["ImGuiPayload"][7]["name"] = "Preview"
@@ -1922,10 +1940,11 @@ defs["structs"]["ImGuiSizeCallbackData"][4]["name"] = "DesiredSize"
 defs["structs"]["ImGuiTextFilter"] = {}
 defs["structs"]["ImGuiTextFilter"][1] = {}
 defs["structs"]["ImGuiTextFilter"][1]["type"] = "char"
-defs["structs"]["ImGuiTextFilter"][1]["name"] = "InputBuf[256]"
 defs["structs"]["ImGuiTextFilter"][1]["size"] = 256
+defs["structs"]["ImGuiTextFilter"][1]["name"] = "InputBuf[256]"
 defs["structs"]["ImGuiTextFilter"][2] = {}
-defs["structs"]["ImGuiTextFilter"][2]["type"] = "ImVector/*<TextRange>*/"
+defs["structs"]["ImGuiTextFilter"][2]["type"] = "ImVector"
+defs["structs"]["ImGuiTextFilter"][2]["template_type"] = "TextRange"
 defs["structs"]["ImGuiTextFilter"][2]["name"] = "Filters"
 defs["structs"]["ImGuiTextFilter"][3] = {}
 defs["structs"]["ImGuiTextFilter"][3]["type"] = "int"
Author	SHA1	Message	Date
Victor Bombi	1789ec81fe	Merge pull request #74 from sonoro1234/ImVector_templates add ImVector template types	2018-10-18 13:07:28 +02:00
sonoro1234	aca412fe7a	add ImVector template types	2018-10-18 13:05:57 +02:00
sonoro1234	7a54d1276d	drop ImFontConfig_DefaultConstructor (already automated)	2018-10-18 09:34:33 +02:00
Victor Bombi	97113ef7ad	Merge pull request #73 from sonoro1234/GlyphRanges Glyph ranges	2018-10-17 20:11:39 +02:00
sonoro1234	2a4dcaf2a2	add constructors and destructor	2018-10-17 20:08:40 +02:00
sonoro1234	5a9a20d139	GlyphRanges test	2018-10-17 12:14:22 +02:00
sonoro1234	7ee838ae2d	include stdint.h	2018-10-16 11:56:31 +02:00
sonoro1234	3091435042	explain template_type	2018-10-14 17:51:10 +02:00
sonoro1234	804acdcecd	add template_type for ImVector templates in structs_and_enums	2018-10-14 17:47:38 +02:00