remove static from structs

Update to v1.66

README.md

@@ -2,7 +2,7 @@
 
 
 This is a thin c-api wrapper programmatically generated for the excellent C++ immediate mode gui [Dear ImGui](https://github.com/ocornut/imgui).
-All functions are programmatically wrapped except constructors, destructors and `ImVector`. (Unless someone find a use case for them)
+All functions are programmatically wrapped except `ImVector` constructors and destructors. (Unless someone find a use case for them)(Now they exist for `ImVector_ImWchar`)
 Generated files are: `cimgui.cpp`, `cimgui.h` for C compilation. Also for helping in bindings creation, `definitions.lua` with function definition information and `structs_and_enums.lua`.
 This library is intended as a intermediate layer to be able to use Dear ImGui from other languages that can interface with C (like D - see [D-binding](https://github.com/Extrawurst/DerelictImgui))
 
@@ -11,8 +11,8 @@ History:
 Initially cimgui was developed by Stephan Dilly as hand-written code but lately turned into an auto-generated version by sonoro1234 in order to keep up with imgui more easily (letting the user select the desired branch and commit)
 
 Notes:
-* currently this wrapper is based on version [1.65 of Dear ImGui]
-* 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#L40). Current overloaded function names can be found in (https://github.com/cimgui/cimgui/blob/master/generator/output/overloads.txt)
+* currently this wrapper is based on version [1.66 of Dear ImGui]
+* 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)
 
 # compilation
 
@@ -32,6 +32,7 @@ Notes:
 * 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/mellinoe/ImGui.NET/tree/autogen/src/CodeGenerator

cimgui.cpp

@@ -1,5 +1,5 @@
 //This file is automatically generated by generator.lua from https://github.com/cimgui/cimgui
-//based on imgui.h file version "1.65" from Dear ImGui https://github.com/ocornut/imgui
+//based on imgui.h file version "1.66" from Dear ImGui https://github.com/ocornut/imgui
 #include "./imgui/imgui.h"
 #include "cimgui.h"
 
@@ -281,9 +281,9 @@ CIMGUI_API void igSetScrollY(float scroll_y)
 {
     return ImGui::SetScrollY(scroll_y);
 }
-CIMGUI_API void igSetScrollHere(float center_y_ratio)
+CIMGUI_API void igSetScrollHereY(float center_y_ratio)
 {
-    return ImGui::SetScrollHere(center_y_ratio);
+    return ImGui::SetScrollHereY(center_y_ratio);
 }
 CIMGUI_API void igSetScrollFromPosY(float pos_y,float center_y_ratio)
 {
@@ -711,9 +711,9 @@ CIMGUI_API bool igSliderFloat4(const char* label,float v[4],float v_min,float v_
 {
     return ImGui::SliderFloat4(label,v,v_min,v_max,format,power);
 }
-CIMGUI_API bool igSliderAngle(const char* label,float* v_rad,float v_degrees_min,float v_degrees_max)
+CIMGUI_API bool igSliderAngle(const char* label,float* v_rad,float v_degrees_min,float v_degrees_max,const char* format)
 {
-    return ImGui::SliderAngle(label,v_rad,v_degrees_min,v_degrees_max);
+    return ImGui::SliderAngle(label,v_rad,v_degrees_min,v_degrees_max,format);
 }
 CIMGUI_API bool igSliderInt(const char* label,int* v,int v_min,int v_max,const char* format)
 {
@@ -1142,6 +1142,10 @@ CIMGUI_API void igEndDragDropTarget()
 {
     return ImGui::EndDragDropTarget();
 }
+CIMGUI_API const ImGuiPayload* igGetDragDropPayload()
+{
+    return ImGui::GetDragDropPayload();
+}
 CIMGUI_API void igPushClipRect(const ImVec2 clip_rect_min,const ImVec2 clip_rect_max,bool intersect_with_current_clip_rect)
 {
     return ImGui::PushClipRect(clip_rect_min,clip_rect_max,intersect_with_current_clip_rect);
@@ -2162,7 +2166,7 @@ CIMGUI_API const char* ImFont_CalcWordWrapPositionA(ImFont* self,float scale,con
 {
     return self->CalcWordWrapPositionA(scale,text,text_end,wrap_width);
 }
-CIMGUI_API void ImFont_RenderChar(ImFont* self,ImDrawList* draw_list,float size,ImVec2 pos,ImU32 col,unsigned short c)
+CIMGUI_API void ImFont_RenderChar(ImFont* self,ImDrawList* draw_list,float size,ImVec2 pos,ImU32 col,ImWchar c)
 {
     return self->RenderChar(draw_list,size,pos,col,c);
 }

cimgui.h

@@ -1,5 +1,5 @@
 //This file is automatically generated by generator.lua from https://github.com/cimgui/cimgui
-//based on imgui.h file version "1.65" from Dear ImGui https://github.com/ocornut/imgui
+//based on imgui.h file version "1.66" from Dear ImGui https://github.com/ocornut/imgui
 #include <stdio.h>
 #include <stdint.h>
 #if defined _WIN32 || defined __CYGWIN__
@@ -140,8 +140,9 @@ enum ImGuiWindowFlags_
     ImGuiWindowFlags_NoScrollWithMouse = 1 << 4,
     ImGuiWindowFlags_NoCollapse = 1 << 5,
     ImGuiWindowFlags_AlwaysAutoResize = 1 << 6,
+    ImGuiWindowFlags_NoBackground = 1 << 7,
     ImGuiWindowFlags_NoSavedSettings = 1 << 8,
-    ImGuiWindowFlags_NoInputs = 1 << 9,
+    ImGuiWindowFlags_NoMouseInputs = 1 << 9,
     ImGuiWindowFlags_MenuBar = 1 << 10,
     ImGuiWindowFlags_HorizontalScrollbar = 1 << 11,
     ImGuiWindowFlags_NoFocusOnAppearing = 1 << 12,
@@ -152,6 +153,8 @@ enum ImGuiWindowFlags_
     ImGuiWindowFlags_NoNavInputs = 1 << 18,
     ImGuiWindowFlags_NoNavFocus = 1 << 19,
     ImGuiWindowFlags_NoNav = ImGuiWindowFlags_NoNavInputs | ImGuiWindowFlags_NoNavFocus,
+    ImGuiWindowFlags_NoDecoration = ImGuiWindowFlags_NoTitleBar | ImGuiWindowFlags_NoResize | ImGuiWindowFlags_NoScrollbar | ImGuiWindowFlags_NoCollapse,
+    ImGuiWindowFlags_NoInputs = ImGuiWindowFlags_NoMouseInputs | ImGuiWindowFlags_NoNavInputs | ImGuiWindowFlags_NoNavFocus,
     ImGuiWindowFlags_NavFlattened = 1 << 23,
     ImGuiWindowFlags_ChildWindow = 1 << 24,
     ImGuiWindowFlags_Tooltip = 1 << 25,
@@ -580,7 +583,6 @@ typedef struct ImVector_CustomRect {int Size;int Capacity;CustomRect* Data;} ImV
 typedef struct ImVector_ImDrawChannel {int Size;int Capacity;ImDrawChannel* Data;} ImVector_ImDrawChannel;
 typedef struct ImVector_char {int Size;int Capacity;char* Data;} ImVector_char;
 typedef struct ImVector_ImTextureID {int Size;int Capacity;ImTextureID* Data;} ImVector_ImTextureID;
-typedef struct ImVector_unsigned_short {int Size;int Capacity;unsigned short* Data;} ImVector_unsigned_short;
 typedef struct ImVector_ImDrawVert {int Size;int Capacity;ImDrawVert* Data;} ImVector_ImDrawVert;
 typedef struct ImVector_ImDrawCmd {int Size;int Capacity;ImDrawCmd* Data;} ImVector_ImDrawCmd;
 typedef struct ImVector_ImFontPtr {int Size;int Capacity;ImFont** Data;} ImVector_ImFontPtr;
@@ -588,7 +590,6 @@ typedef struct ImVector_TextRange {int Size;int Capacity;TextRange* Data;} ImVec
 typedef struct ImVector_ImVec4 {int Size;int Capacity;ImVec4* Data;} ImVector_ImVec4;
 typedef struct ImVector_ImDrawIdx {int Size;int Capacity;ImDrawIdx* Data;} ImVector_ImDrawIdx;
 typedef struct ImVector_ImVec2 {int Size;int Capacity;ImVec2* Data;} ImVector_ImVec2;
-struct ImNewDummy {};
 struct ImGuiOnceUponAFrame
 {
      int RefFrame;
@@ -602,6 +603,7 @@ struct ImGuiTextFilter
 struct ImGuiTextBuffer
 {
     ImVector_char Buf;
+     char EmptyString[1];
 };
 struct ImGuiStorage
 {
@@ -774,7 +776,7 @@ struct ImFont
     ImVec2 DisplayOffset;
     ImVector_ImFontGlyph Glyphs;
     ImVector_float IndexAdvanceX;
-    ImVector_unsigned_short IndexLookup;
+    ImVector_ImWchar IndexLookup;
     const ImFontGlyph* FallbackGlyph;
     float FallbackAdvanceX;
     ImWchar FallbackChar;
@@ -914,7 +916,7 @@ CIMGUI_API float igGetScrollMaxX(void);
 CIMGUI_API float igGetScrollMaxY(void);
 CIMGUI_API void igSetScrollX(float scroll_x);
 CIMGUI_API void igSetScrollY(float scroll_y);
-CIMGUI_API void igSetScrollHere(float center_y_ratio);
+CIMGUI_API void igSetScrollHereY(float center_y_ratio);
 CIMGUI_API void igSetScrollFromPosY(float pos_y,float center_y_ratio);
 CIMGUI_API void igPushFont(ImFont* font);
 CIMGUI_API void igPopFont(void);
@@ -1017,7 +1019,7 @@ CIMGUI_API bool igSliderFloat(const char* label,float* v,float v_min,float v_max
 CIMGUI_API bool igSliderFloat2(const char* label,float v[2],float v_min,float v_max,const char* format,float power);
 CIMGUI_API bool igSliderFloat3(const char* label,float v[3],float v_min,float v_max,const char* format,float power);
 CIMGUI_API bool igSliderFloat4(const char* label,float v[4],float v_min,float v_max,const char* format,float power);
-CIMGUI_API bool igSliderAngle(const char* label,float* v_rad,float v_degrees_min,float v_degrees_max);
+CIMGUI_API bool igSliderAngle(const char* label,float* v_rad,float v_degrees_min,float v_degrees_max,const char* format);
 CIMGUI_API bool igSliderInt(const char* label,int* v,int v_min,int v_max,const char* format);
 CIMGUI_API bool igSliderInt2(const char* label,int v[2],int v_min,int v_max,const char* format);
 CIMGUI_API bool igSliderInt3(const char* label,int v[3],int v_min,int v_max,const char* format);
@@ -1120,6 +1122,7 @@ CIMGUI_API void igEndDragDropSource(void);
 CIMGUI_API bool igBeginDragDropTarget(void);
 CIMGUI_API const ImGuiPayload* igAcceptDragDropPayload(const char* type,ImGuiDragDropFlags flags);
 CIMGUI_API void igEndDragDropTarget(void);
+CIMGUI_API const ImGuiPayload* igGetDragDropPayload(void);
 CIMGUI_API void igPushClipRect(const ImVec2 clip_rect_min,const ImVec2 clip_rect_max,bool intersect_with_current_clip_rect);
 CIMGUI_API void igPopClipRect(void);
 CIMGUI_API void igSetItemDefaultFocus(void);
@@ -1375,7 +1378,7 @@ 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 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,unsigned short c);
+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);
 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);

generator/generator.bat

@@ -10,7 +10,7 @@
 :: 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:\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

generator/generator.lua

@@ -139,11 +139,7 @@ local prepro = {
     [   "IMGUI_DISABLE_OBSOLETE_FUNCTIONS"      ]=false,
 },
 }
-    --only one case is true
-    local function prepro_boolifBAK(line)
-        local ma = line:match("#ifndef%s+IMGUI_OVERRIDE_DRAWVERT_STRUCT_LAYOUT") or line:match("#ifndef%s+ImTextureID")
-        return not (ma==nil)
-    end
+
     local function prepro_boolif(pre,cond)
         local conds = prepro[pre]
         assert(conds,pre.." has no conds-----------------------------")
@@ -307,18 +303,18 @@ local function serializeTable(name, value, saved)
             for k,v in pairs(value) do
                 table.insert(ordered_keys,k)
             end
-			local function sorter(a,b)
-				if type(a)==type(b) then 
-					return a<b 
-				elseif type(a)=="number" then
-					return true
-				else
-					assert(type(b)=="number")
-					return false
-				end
-			end
+            local function sorter(a,b)
+                if type(a)==type(b) then 
+                    return a<b 
+                elseif type(a)=="number" then
+                    return true
+                else
+                    assert(type(b)=="number")
+                    return false
+                end
+            end
             table.sort(ordered_keys,sorter)
-			for _,k in ipairs(ordered_keys) do
+            for _,k in ipairs(ordered_keys) do
                 local v = value[k]
 --]]
            -- for k,v in pairs(value) do      -- save its fields
@@ -437,7 +433,7 @@ local function struct_parser()
         elseif line:match("public:") then
             --nothing
         else
-            local linea = line:gsub("%S+",{class="struct",mutable=""})
+            local linea = line:gsub("%S+",{class="struct",mutable="",static=""})
             local template = linea:match("ImVector<(.+)>")
             if template then
                 local te = template:gsub("%s","_")
@@ -779,6 +775,16 @@ local function func_parser()
                     table.insert(strt,string.format("%d\t%s\t%s %s",i,t.ret,t.ov_cimguiname,t.signature))
                     --prtable(typesc[i])
                 end
+                --check not two names are equal (produced by bad cimguiname_overload)
+                for i=1,#v-1 do 
+                    for j=i+1,#v-1 do
+                        if v[i].ov_cimguiname == v[j].ov_cimguiname then
+                          local t,tj = v[i],v[j]
+                          print("Error caused by Bad overloading "..t.ov_cimguiname.." of function ",t.funcname,t.signature,"conflicts with ",tj.funcname,tj.signature)
+                          error("Bad overloading:"..t.ov_cimguiname) 
+                        end
+                    end
+                end
             end
         end
         --print(numoverloaded, "overloaded")
@@ -1055,14 +1061,11 @@ local function gen_structs_and_enums_table(cdefs)
     return outtab, typedefs_dict
 end
 
-local function generate_templates(code,templates,typedefs)
+local function generate_templates(code,templates)
     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,"typedef struct ImVector_"..te.." {int Size;int Capacity;"..k.."* Data;} ImVector_"..te..";\n")
-        --table.insert(typedefs,"typedef struct ImVector_"..te.." ImVector_"..te..";\n")
     end
 end
 
@@ -1078,7 +1081,6 @@ local function gen_structs_and_enums(cdefs,templates)
     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")
@@ -1091,7 +1093,10 @@ local function gen_structs_and_enums(cdefs,templates)
         local desired_linelen = (linelen==0) and 0 or math.max(math.ceil(linelen/10)*10,40)
         local spaces_to_add = 0 --desired_linelen - linelen
         local linecom = line..string.rep(" ",spaces_to_add)..comment
-
+        
+         -- ImNewDummy drop for MSVC
+        if line:match"ImNewDummy" then break end
+        
         if line:match(namespace_re) then
             in_namespace = true
         end
@@ -1103,12 +1108,12 @@ local function gen_structs_and_enums(cdefs,templates)
                 break
             end
         end
-        
+       
         -- ImVector special treatment
         if structnames[#structnames] == "ImVector" then
             if line:match(struct_closing_re) then
                 table.insert(outtab,[[typedef struct ImVector{int Size;int Capacity;void* Data;} ImVector;]].."\n")
-                generate_templates(outtab,templates,typedefs_table)
+                generate_templates(outtab,templates)
                 structnames[#structnames] = nil
             end
             break -- dont write
@@ -1124,7 +1129,6 @@ local function gen_structs_and_enums(cdefs,templates)
         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
@@ -1138,7 +1142,6 @@ local function gen_structs_and_enums(cdefs,templates)
             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
@@ -1155,7 +1158,6 @@ local function gen_structs_and_enums(cdefs,templates)
                     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
@@ -1163,7 +1165,6 @@ local function gen_structs_and_enums(cdefs,templates)
                 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
@@ -1183,9 +1184,10 @@ local function gen_structs_and_enums(cdefs,templates)
     for i,l in ipairs(typedefs_table) do
         if not uniques[l] then
             uniques[l] = true
-            table.insert(outtab,linetypedefs,l)
+            table.insert(outtab,1,l)
         end
     end
+    --if templates then generate_templates(outtab,templates) end
     local cstructsstr = table.concat(outtab)
     cstructsstr = cstructsstr:gsub("\n+","\n") --several empty lines to one empty line
     return cstructsstr, typedefs_dict
@@ -1441,26 +1443,26 @@ local function DefsByStruct(FP)
     for fun,defs in pairs(FP.defsT) do
         local stname = defs[1].stname
         structs[stname] = structs[stname] or {}
-        table.insert(structs[stname],fun)
-    end
-    for st,funs in pairs(struct) do
-        struct[st] = table.sort(funs)
+        table.insert(structs[stname],defs)--fun)
     end
+    -- for st,funs in pairs(struct) do
+        -- struct[st] = table.sort(funs)
+    -- end
     FP.defsBystruct = struct
 end  
 local function AdjustArguments(FP)
-	for fun,defs in pairs(FP.defsT) do
-		--struct function but no constructors
-		if defs[1].stname~="ImGui" and defs[1].stname~="" and defs[1].ret then
-			--print("adjusting",fun)
-			for i,def in ipairs(defs) do
-				local empty = def.args:match("^%(%)") --no args
-				--local ptret = def.retref and "&" or ""
-				def.args = def.args:gsub("^%(","("..def.stname.."* self"..(empty and "" or ","))
-				table.insert(def.argsT,1,{type=def.stname.."*",name="self"})
-			end
-		end
-	end
+    for fun,defs in pairs(FP.defsT) do
+        --struct function but no constructors
+        if defs[1].stname~="ImGui" and defs[1].stname~="" and defs[1].ret then
+            --print("adjusting",fun)
+            for i,def in ipairs(defs) do
+                local empty = def.args:match("^%(%)") --no args
+                --local ptret = def.retref and "&" or ""
+                def.args = def.args:gsub("^%(","("..def.stname.."* self"..(empty and "" or ","))
+                table.insert(def.argsT,1,{type=def.stname.."*",name="self"})
+            end
+        end
+    end
 end
 --generate cimgui.cpp cimgui.h and auto versions depending on postfix
 local function cimgui_generation(postfix,STP,FP)
@@ -1547,7 +1549,7 @@ local ovstr = pFP:compute_overloads()
 AdjustArguments(pFP)
 ADDnonUDT(pFP)
 ADDdestructors(pFP)
---DefsByStruct(pFP)
+
 save_data("./output/overloads.txt",ovstr)
 typedefs_dict2 = cimgui_generation("",pSTP,pFP)
 --check arg detection failure if no name in function declaration
@@ -1555,6 +1557,7 @@ check_arg_detection(pFP.defsT,typedefs_dict2)
 
 
 ----------save fundefs in definitions.lua for using in bindings
+--DefsByStruct(pFP)
 set_defines(pFP.defsT) 
 save_data("./output/definitions.lua",serializeTable("defs",pFP.defsT),"\nreturn defs")
 

generator/output/cimgui.cpp

@@ -1,5 +1,5 @@
 //This file is automatically generated by generator.lua from https://github.com/cimgui/cimgui
-//based on imgui.h file version "1.65" from Dear ImGui https://github.com/ocornut/imgui
+//based on imgui.h file version "1.66" from Dear ImGui https://github.com/ocornut/imgui
 #include "./imgui/imgui.h"
 #include "cimgui.h"
 
@@ -281,9 +281,9 @@ CIMGUI_API void igSetScrollY(float scroll_y)
 {
     return ImGui::SetScrollY(scroll_y);
 }
-CIMGUI_API void igSetScrollHere(float center_y_ratio)
+CIMGUI_API void igSetScrollHereY(float center_y_ratio)
 {
-    return ImGui::SetScrollHere(center_y_ratio);
+    return ImGui::SetScrollHereY(center_y_ratio);
 }
 CIMGUI_API void igSetScrollFromPosY(float pos_y,float center_y_ratio)
 {
@@ -711,9 +711,9 @@ CIMGUI_API bool igSliderFloat4(const char* label,float v[4],float v_min,float v_
 {
     return ImGui::SliderFloat4(label,v,v_min,v_max,format,power);
 }
-CIMGUI_API bool igSliderAngle(const char* label,float* v_rad,float v_degrees_min,float v_degrees_max)
+CIMGUI_API bool igSliderAngle(const char* label,float* v_rad,float v_degrees_min,float v_degrees_max,const char* format)
 {
-    return ImGui::SliderAngle(label,v_rad,v_degrees_min,v_degrees_max);
+    return ImGui::SliderAngle(label,v_rad,v_degrees_min,v_degrees_max,format);
 }
 CIMGUI_API bool igSliderInt(const char* label,int* v,int v_min,int v_max,const char* format)
 {
@@ -1142,6 +1142,10 @@ CIMGUI_API void igEndDragDropTarget()
 {
     return ImGui::EndDragDropTarget();
 }
+CIMGUI_API const ImGuiPayload* igGetDragDropPayload()
+{
+    return ImGui::GetDragDropPayload();
+}
 CIMGUI_API void igPushClipRect(const ImVec2 clip_rect_min,const ImVec2 clip_rect_max,bool intersect_with_current_clip_rect)
 {
     return ImGui::PushClipRect(clip_rect_min,clip_rect_max,intersect_with_current_clip_rect);
@@ -2162,7 +2166,7 @@ CIMGUI_API const char* ImFont_CalcWordWrapPositionA(ImFont* self,float scale,con
 {
     return self->CalcWordWrapPositionA(scale,text,text_end,wrap_width);
 }
-CIMGUI_API void ImFont_RenderChar(ImFont* self,ImDrawList* draw_list,float size,ImVec2 pos,ImU32 col,unsigned short c)
+CIMGUI_API void ImFont_RenderChar(ImFont* self,ImDrawList* draw_list,float size,ImVec2 pos,ImU32 col,ImWchar c)
 {
     return self->RenderChar(draw_list,size,pos,col,c);
 }

generator/output/cimgui.h

@@ -1,5 +1,5 @@
 //This file is automatically generated by generator.lua from https://github.com/cimgui/cimgui
-//based on imgui.h file version "1.65" from Dear ImGui https://github.com/ocornut/imgui
+//based on imgui.h file version "1.66" from Dear ImGui https://github.com/ocornut/imgui
 #include <stdio.h>
 #include <stdint.h>
 #if defined _WIN32 || defined __CYGWIN__
@@ -140,8 +140,9 @@ enum ImGuiWindowFlags_
     ImGuiWindowFlags_NoScrollWithMouse = 1 << 4,
     ImGuiWindowFlags_NoCollapse = 1 << 5,
     ImGuiWindowFlags_AlwaysAutoResize = 1 << 6,
+    ImGuiWindowFlags_NoBackground = 1 << 7,
     ImGuiWindowFlags_NoSavedSettings = 1 << 8,
-    ImGuiWindowFlags_NoInputs = 1 << 9,
+    ImGuiWindowFlags_NoMouseInputs = 1 << 9,
     ImGuiWindowFlags_MenuBar = 1 << 10,
     ImGuiWindowFlags_HorizontalScrollbar = 1 << 11,
     ImGuiWindowFlags_NoFocusOnAppearing = 1 << 12,
@@ -152,6 +153,8 @@ enum ImGuiWindowFlags_
     ImGuiWindowFlags_NoNavInputs = 1 << 18,
     ImGuiWindowFlags_NoNavFocus = 1 << 19,
     ImGuiWindowFlags_NoNav = ImGuiWindowFlags_NoNavInputs | ImGuiWindowFlags_NoNavFocus,
+    ImGuiWindowFlags_NoDecoration = ImGuiWindowFlags_NoTitleBar | ImGuiWindowFlags_NoResize | ImGuiWindowFlags_NoScrollbar | ImGuiWindowFlags_NoCollapse,
+    ImGuiWindowFlags_NoInputs = ImGuiWindowFlags_NoMouseInputs | ImGuiWindowFlags_NoNavInputs | ImGuiWindowFlags_NoNavFocus,
     ImGuiWindowFlags_NavFlattened = 1 << 23,
     ImGuiWindowFlags_ChildWindow = 1 << 24,
     ImGuiWindowFlags_Tooltip = 1 << 25,
@@ -580,7 +583,6 @@ typedef struct ImVector_CustomRect {int Size;int Capacity;CustomRect* Data;} ImV
 typedef struct ImVector_ImDrawChannel {int Size;int Capacity;ImDrawChannel* Data;} ImVector_ImDrawChannel;
 typedef struct ImVector_char {int Size;int Capacity;char* Data;} ImVector_char;
 typedef struct ImVector_ImTextureID {int Size;int Capacity;ImTextureID* Data;} ImVector_ImTextureID;
-typedef struct ImVector_unsigned_short {int Size;int Capacity;unsigned short* Data;} ImVector_unsigned_short;
 typedef struct ImVector_ImDrawVert {int Size;int Capacity;ImDrawVert* Data;} ImVector_ImDrawVert;
 typedef struct ImVector_ImDrawCmd {int Size;int Capacity;ImDrawCmd* Data;} ImVector_ImDrawCmd;
 typedef struct ImVector_ImFontPtr {int Size;int Capacity;ImFont** Data;} ImVector_ImFontPtr;
@@ -588,7 +590,6 @@ typedef struct ImVector_TextRange {int Size;int Capacity;TextRange* Data;} ImVec
 typedef struct ImVector_ImVec4 {int Size;int Capacity;ImVec4* Data;} ImVector_ImVec4;
 typedef struct ImVector_ImDrawIdx {int Size;int Capacity;ImDrawIdx* Data;} ImVector_ImDrawIdx;
 typedef struct ImVector_ImVec2 {int Size;int Capacity;ImVec2* Data;} ImVector_ImVec2;
-struct ImNewDummy {};
 struct ImGuiOnceUponAFrame
 {
      int RefFrame;
@@ -602,6 +603,7 @@ struct ImGuiTextFilter
 struct ImGuiTextBuffer
 {
     ImVector_char Buf;
+     char EmptyString[1];
 };
 struct ImGuiStorage
 {
@@ -774,7 +776,7 @@ struct ImFont
     ImVec2 DisplayOffset;
     ImVector_ImFontGlyph Glyphs;
     ImVector_float IndexAdvanceX;
-    ImVector_unsigned_short IndexLookup;
+    ImVector_ImWchar IndexLookup;
     const ImFontGlyph* FallbackGlyph;
     float FallbackAdvanceX;
     ImWchar FallbackChar;
@@ -914,7 +916,7 @@ CIMGUI_API float igGetScrollMaxX(void);
 CIMGUI_API float igGetScrollMaxY(void);
 CIMGUI_API void igSetScrollX(float scroll_x);
 CIMGUI_API void igSetScrollY(float scroll_y);
-CIMGUI_API void igSetScrollHere(float center_y_ratio);
+CIMGUI_API void igSetScrollHereY(float center_y_ratio);
 CIMGUI_API void igSetScrollFromPosY(float pos_y,float center_y_ratio);
 CIMGUI_API void igPushFont(ImFont* font);
 CIMGUI_API void igPopFont(void);
@@ -1017,7 +1019,7 @@ CIMGUI_API bool igSliderFloat(const char* label,float* v,float v_min,float v_max
 CIMGUI_API bool igSliderFloat2(const char* label,float v[2],float v_min,float v_max,const char* format,float power);
 CIMGUI_API bool igSliderFloat3(const char* label,float v[3],float v_min,float v_max,const char* format,float power);
 CIMGUI_API bool igSliderFloat4(const char* label,float v[4],float v_min,float v_max,const char* format,float power);
-CIMGUI_API bool igSliderAngle(const char* label,float* v_rad,float v_degrees_min,float v_degrees_max);
+CIMGUI_API bool igSliderAngle(const char* label,float* v_rad,float v_degrees_min,float v_degrees_max,const char* format);
 CIMGUI_API bool igSliderInt(const char* label,int* v,int v_min,int v_max,const char* format);
 CIMGUI_API bool igSliderInt2(const char* label,int v[2],int v_min,int v_max,const char* format);
 CIMGUI_API bool igSliderInt3(const char* label,int v[3],int v_min,int v_max,const char* format);
@@ -1120,6 +1122,7 @@ CIMGUI_API void igEndDragDropSource(void);
 CIMGUI_API bool igBeginDragDropTarget(void);
 CIMGUI_API const ImGuiPayload* igAcceptDragDropPayload(const char* type,ImGuiDragDropFlags flags);
 CIMGUI_API void igEndDragDropTarget(void);
+CIMGUI_API const ImGuiPayload* igGetDragDropPayload(void);
 CIMGUI_API void igPushClipRect(const ImVec2 clip_rect_min,const ImVec2 clip_rect_max,bool intersect_with_current_clip_rect);
 CIMGUI_API void igPopClipRect(void);
 CIMGUI_API void igSetItemDefaultFocus(void);
@@ -1375,7 +1378,7 @@ 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 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,unsigned short c);
+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);
 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);

generator/output/definitions.lua

@@ -3095,7 +3095,7 @@ defs["ImFont_IsLoaded"][1]["stname"] = "ImFont"
 defs["ImFont_IsLoaded"]["()"] = defs["ImFont_IsLoaded"][1]
 defs["ImFont_RenderChar"] = {}
 defs["ImFont_RenderChar"][1] = {}
-defs["ImFont_RenderChar"][1]["args"] = "(ImFont* self,ImDrawList* draw_list,float size,ImVec2 pos,ImU32 col,unsigned short c)"
+defs["ImFont_RenderChar"][1]["args"] = "(ImFont* self,ImDrawList* draw_list,float size,ImVec2 pos,ImU32 col,ImWchar c)"
 defs["ImFont_RenderChar"][1]["argsT"] = {}
 defs["ImFont_RenderChar"][1]["argsT"][1] = {}
 defs["ImFont_RenderChar"][1]["argsT"][1]["name"] = "self"
@@ -3114,17 +3114,17 @@ defs["ImFont_RenderChar"][1]["argsT"][5]["name"] = "col"
 defs["ImFont_RenderChar"][1]["argsT"][5]["type"] = "ImU32"
 defs["ImFont_RenderChar"][1]["argsT"][6] = {}
 defs["ImFont_RenderChar"][1]["argsT"][6]["name"] = "c"
-defs["ImFont_RenderChar"][1]["argsT"][6]["type"] = "unsigned short"
-defs["ImFont_RenderChar"][1]["argsoriginal"] = "(ImDrawList* draw_list,float size,ImVec2 pos,ImU32 col,unsigned short c)"
+defs["ImFont_RenderChar"][1]["argsT"][6]["type"] = "ImWchar"
+defs["ImFont_RenderChar"][1]["argsoriginal"] = "(ImDrawList* draw_list,float size,ImVec2 pos,ImU32 col,ImWchar c)"
 defs["ImFont_RenderChar"][1]["call_args"] = "(draw_list,size,pos,col,c)"
 defs["ImFont_RenderChar"][1]["cimguiname"] = "ImFont_RenderChar"
 defs["ImFont_RenderChar"][1]["comment"] = ""
 defs["ImFont_RenderChar"][1]["defaults"] = {}
 defs["ImFont_RenderChar"][1]["funcname"] = "RenderChar"
 defs["ImFont_RenderChar"][1]["ret"] = "void"
-defs["ImFont_RenderChar"][1]["signature"] = "(ImDrawList*,float,ImVec2,ImU32,unsigned short)"
+defs["ImFont_RenderChar"][1]["signature"] = "(ImDrawList*,float,ImVec2,ImU32,ImWchar)"
 defs["ImFont_RenderChar"][1]["stname"] = "ImFont"
-defs["ImFont_RenderChar"]["(ImDrawList*,float,ImVec2,ImU32,unsigned short)"] = defs["ImFont_RenderChar"][1]
+defs["ImFont_RenderChar"]["(ImDrawList*,float,ImVec2,ImU32,ImWchar)"] = defs["ImFont_RenderChar"][1]
 defs["ImFont_RenderText"] = {}
 defs["ImFont_RenderText"][1] = {}
 defs["ImFont_RenderText"][1]["args"] = "(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)"
@@ -6965,6 +6965,20 @@ defs["igGetCursorStartPos"][3]["stname"] = "ImGui"
 defs["igGetCursorStartPos"]["()"] = defs["igGetCursorStartPos"][1]
 defs["igGetCursorStartPos"]["()nonUDT"] = defs["igGetCursorStartPos"][2]
 defs["igGetCursorStartPos"]["()nonUDT2"] = defs["igGetCursorStartPos"][3]
+defs["igGetDragDropPayload"] = {}
+defs["igGetDragDropPayload"][1] = {}
+defs["igGetDragDropPayload"][1]["args"] = "()"
+defs["igGetDragDropPayload"][1]["argsT"] = {}
+defs["igGetDragDropPayload"][1]["argsoriginal"] = "()"
+defs["igGetDragDropPayload"][1]["call_args"] = "()"
+defs["igGetDragDropPayload"][1]["cimguiname"] = "igGetDragDropPayload"
+defs["igGetDragDropPayload"][1]["comment"] = ""
+defs["igGetDragDropPayload"][1]["defaults"] = {}
+defs["igGetDragDropPayload"][1]["funcname"] = "GetDragDropPayload"
+defs["igGetDragDropPayload"][1]["ret"] = "const ImGuiPayload*"
+defs["igGetDragDropPayload"][1]["signature"] = "()"
+defs["igGetDragDropPayload"][1]["stname"] = "ImGui"
+defs["igGetDragDropPayload"]["()"] = defs["igGetDragDropPayload"][1]
 defs["igGetDrawData"] = {}
 defs["igGetDrawData"][1] = {}
 defs["igGetDrawData"][1]["args"] = "()"
@@ -10782,24 +10796,24 @@ defs["igSetScrollFromPosY"][1]["ret"] = "void"
 defs["igSetScrollFromPosY"][1]["signature"] = "(float,float)"
 defs["igSetScrollFromPosY"][1]["stname"] = "ImGui"
 defs["igSetScrollFromPosY"]["(float,float)"] = defs["igSetScrollFromPosY"][1]
-defs["igSetScrollHere"] = {}
-defs["igSetScrollHere"][1] = {}
-defs["igSetScrollHere"][1]["args"] = "(float center_y_ratio)"
-defs["igSetScrollHere"][1]["argsT"] = {}
-defs["igSetScrollHere"][1]["argsT"][1] = {}
-defs["igSetScrollHere"][1]["argsT"][1]["name"] = "center_y_ratio"
-defs["igSetScrollHere"][1]["argsT"][1]["type"] = "float"
-defs["igSetScrollHere"][1]["argsoriginal"] = "(float center_y_ratio=0.5f)"
-defs["igSetScrollHere"][1]["call_args"] = "(center_y_ratio)"
-defs["igSetScrollHere"][1]["cimguiname"] = "igSetScrollHere"
-defs["igSetScrollHere"][1]["comment"] = ""
-defs["igSetScrollHere"][1]["defaults"] = {}
-defs["igSetScrollHere"][1]["defaults"]["center_y_ratio"] = "0.5f"
-defs["igSetScrollHere"][1]["funcname"] = "SetScrollHere"
-defs["igSetScrollHere"][1]["ret"] = "void"
-defs["igSetScrollHere"][1]["signature"] = "(float)"
-defs["igSetScrollHere"][1]["stname"] = "ImGui"
-defs["igSetScrollHere"]["(float)"] = defs["igSetScrollHere"][1]
+defs["igSetScrollHereY"] = {}
+defs["igSetScrollHereY"][1] = {}
+defs["igSetScrollHereY"][1]["args"] = "(float center_y_ratio)"
+defs["igSetScrollHereY"][1]["argsT"] = {}
+defs["igSetScrollHereY"][1]["argsT"][1] = {}
+defs["igSetScrollHereY"][1]["argsT"][1]["name"] = "center_y_ratio"
+defs["igSetScrollHereY"][1]["argsT"][1]["type"] = "float"
+defs["igSetScrollHereY"][1]["argsoriginal"] = "(float center_y_ratio=0.5f)"
+defs["igSetScrollHereY"][1]["call_args"] = "(center_y_ratio)"
+defs["igSetScrollHereY"][1]["cimguiname"] = "igSetScrollHereY"
+defs["igSetScrollHereY"][1]["comment"] = ""
+defs["igSetScrollHereY"][1]["defaults"] = {}
+defs["igSetScrollHereY"][1]["defaults"]["center_y_ratio"] = "0.5f"
+defs["igSetScrollHereY"][1]["funcname"] = "SetScrollHereY"
+defs["igSetScrollHereY"][1]["ret"] = "void"
+defs["igSetScrollHereY"][1]["signature"] = "(float)"
+defs["igSetScrollHereY"][1]["stname"] = "ImGui"
+defs["igSetScrollHereY"]["(float)"] = defs["igSetScrollHereY"][1]
 defs["igSetScrollX"] = {}
 defs["igSetScrollX"][1] = {}
 defs["igSetScrollX"][1]["args"] = "(float scroll_x)"
@@ -11183,7 +11197,7 @@ defs["igShowUserGuide"][1]["stname"] = "ImGui"
 defs["igShowUserGuide"]["()"] = defs["igShowUserGuide"][1]
 defs["igSliderAngle"] = {}
 defs["igSliderAngle"][1] = {}
-defs["igSliderAngle"][1]["args"] = "(const char* label,float* v_rad,float v_degrees_min,float v_degrees_max)"
+defs["igSliderAngle"][1]["args"] = "(const char* label,float* v_rad,float v_degrees_min,float v_degrees_max,const char* format)"
 defs["igSliderAngle"][1]["argsT"] = {}
 defs["igSliderAngle"][1]["argsT"][1] = {}
 defs["igSliderAngle"][1]["argsT"][1]["name"] = "label"
@@ -11197,18 +11211,22 @@ defs["igSliderAngle"][1]["argsT"][3]["type"] = "float"
 defs["igSliderAngle"][1]["argsT"][4] = {}
 defs["igSliderAngle"][1]["argsT"][4]["name"] = "v_degrees_max"
 defs["igSliderAngle"][1]["argsT"][4]["type"] = "float"
-defs["igSliderAngle"][1]["argsoriginal"] = "(const char* label,float* v_rad,float v_degrees_min=-360.0f,float v_degrees_max=+360.0f)"
-defs["igSliderAngle"][1]["call_args"] = "(label,v_rad,v_degrees_min,v_degrees_max)"
+defs["igSliderAngle"][1]["argsT"][5] = {}
+defs["igSliderAngle"][1]["argsT"][5]["name"] = "format"
+defs["igSliderAngle"][1]["argsT"][5]["type"] = "const char*"
+defs["igSliderAngle"][1]["argsoriginal"] = "(const char* label,float* v_rad,float v_degrees_min=-360.0f,float v_degrees_max=+360.0f,const char* format=\"%.0f deg\")"
+defs["igSliderAngle"][1]["call_args"] = "(label,v_rad,v_degrees_min,v_degrees_max,format)"
 defs["igSliderAngle"][1]["cimguiname"] = "igSliderAngle"
 defs["igSliderAngle"][1]["comment"] = ""
 defs["igSliderAngle"][1]["defaults"] = {}
+defs["igSliderAngle"][1]["defaults"]["format"] = "\"%.0f deg\""
 defs["igSliderAngle"][1]["defaults"]["v_degrees_max"] = "+360.0f"
 defs["igSliderAngle"][1]["defaults"]["v_degrees_min"] = "-360.0f"
 defs["igSliderAngle"][1]["funcname"] = "SliderAngle"
 defs["igSliderAngle"][1]["ret"] = "bool"
-defs["igSliderAngle"][1]["signature"] = "(const char*,float*,float,float)"
+defs["igSliderAngle"][1]["signature"] = "(const char*,float*,float,float,const char*)"
 defs["igSliderAngle"][1]["stname"] = "ImGui"
-defs["igSliderAngle"]["(const char*,float*,float,float)"] = defs["igSliderAngle"][1]
+defs["igSliderAngle"]["(const char*,float*,float,float,const char*)"] = defs["igSliderAngle"][1]
 defs["igSliderFloat"] = {}
 defs["igSliderFloat"][1] = {}
 defs["igSliderFloat"][1]["args"] = "(const char* label,float* v,float v_min,float v_max,const char* format,float power)"

generator/output/overloads.txt

@@ -29,28 +29,23 @@ igSetWindowCollapsed	2
 igPlotLines	2
 1	void	igPlotLines (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)
-ImVec2_ImVec2	2
-1	nil	ImVec2_ImVec2 ()
-2	nil	ImVec2_ImVec2Float (float,float)
+igListBoxHeader	2
+1	bool	igListBoxHeaderVec2 (const char*,const ImVec2)
+2	bool	igListBoxHeaderInt (const char*,int,int)
 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)
 igTreeNodeExV	2
 1	bool	igTreeNodeExVStr (const char*,ImGuiTreeNodeFlags,const char*,va_list)
 2	bool	igTreeNodeExVPtr (const void*,ImGuiTreeNodeFlags,const char*,va_list)
-igMenuItem	2
-1	bool	igMenuItemBool (const char*,const char*,bool,bool)
-2	bool	igMenuItemBoolPtr (const char*,const char*,bool*,bool)
 igGetID	3
 1	ImGuiID	igGetIDStr (const char*)
 2	ImGuiID	igGetIDRange (const char*,const char*)
 3	ImGuiID	igGetIDPtr (const void*)
-igListBoxHeader	2
-1	bool	igListBoxHeaderVec2 (const char*,const ImVec2)
-2	bool	igListBoxHeaderInt (const char*,int,int)
-igTreePush	2
-1	void	igTreePushStr (const char*)
-2	void	igTreePushPtr (const void*)
+igGetColorU32	3
+1	ImU32	igGetColorU32 (ImGuiCol,float)
+2	ImU32	igGetColorU32Vec4 (const ImVec4)
+3	ImU32	igGetColorU32U32 (ImU32)
 igBeginChild	2
 1	bool	igBeginChild (const char*,const ImVec2,bool,ImGuiWindowFlags)
 2	bool	igBeginChildID (ImGuiID,const ImVec2,bool,ImGuiWindowFlags)
@@ -63,44 +58,49 @@ igSelectable	2
 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)
+igSetWindowFocus	2
+1	void	igSetWindowFocus ()
+2	void	igSetWindowFocusStr (const char*)
 igPushID	4
 1	void	igPushIDStr (const char*)
 2	void	igPushIDRange (const char*,const char*)
 3	void	igPushIDPtr (const void*)
 4	void	igPushIDInt (int)
+igTreeNodeEx	3
+1	bool	igTreeNodeExStr (const char*,ImGuiTreeNodeFlags)
+2	bool	igTreeNodeExStrStr (const char*,ImGuiTreeNodeFlags,const char*,...)
+3	bool	igTreeNodeExPtr (const void*,ImGuiTreeNodeFlags,const char*,...)
 Pair_Pair	3
 1	nil	Pair_PairInt (ImGuiID,int)
 2	nil	Pair_PairFloat (ImGuiID,float)
 3	nil	Pair_PairPtr (ImGuiID,void*)
+igTreePush	2
+1	void	igTreePushStr (const char*)
+2	void	igTreePushPtr (const void*)
 TextRange_TextRange	2
 1	nil	TextRange_TextRange ()
 2	nil	TextRange_TextRangeStr (const char*,const char*)
-igSetWindowFocus	2
-1	void	igSetWindowFocus ()
-2	void	igSetWindowFocusStr (const char*)
+igPushStyleColor	2
+1	void	igPushStyleColorU32 (ImGuiCol,ImU32)
+2	void	igPushStyleColor (ImGuiCol,const ImVec4)
 ImColor_ImColor	5
 1	nil	ImColor_ImColor ()
 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)
-igPushStyleColor	2
-1	void	igPushStyleColorU32 (ImGuiCol,ImU32)
-2	void	igPushStyleColor (ImGuiCol,const ImVec4)
 igCollapsingHeader	2
 1	bool	igCollapsingHeader (const char*,ImGuiTreeNodeFlags)
 2	bool	igCollapsingHeaderBoolPtr (const char*,bool*,ImGuiTreeNodeFlags)
-igGetColorU32	3
-1	ImU32	igGetColorU32 (ImGuiCol,float)
-2	ImU32	igGetColorU32Vec4 (const ImVec4)
-3	ImU32	igGetColorU32U32 (ImU32)
+igMenuItem	2
+1	bool	igMenuItemBool (const char*,const char*,bool,bool)
+2	bool	igMenuItemBoolPtr (const char*,const char*,bool*,bool)
 igSetWindowPos	2
 1	void	igSetWindowPosVec2 (const ImVec2,ImGuiCond)
 2	void	igSetWindowPosStr (const char*,const ImVec2,ImGuiCond)
-igTreeNodeEx	3
-1	bool	igTreeNodeExStr (const char*,ImGuiTreeNodeFlags)
-2	bool	igTreeNodeExStrStr (const char*,ImGuiTreeNodeFlags,const char*,...)
-3	bool	igTreeNodeExPtr (const void*,ImGuiTreeNodeFlags,const char*,...)
+ImVec2_ImVec2	2
+1	nil	ImVec2_ImVec2 ()
+2	nil	ImVec2_ImVec2Float (float,float)
 igTreeNode	3
 1	bool	igTreeNodeStr (const char*)
 2	bool	igTreeNodeStrStr (const char*,const char*,...)

generator/output/structs_and_enums.lua

@@ -1107,77 +1107,89 @@ defs["enums"]["ImGuiWindowFlags_"][8]["calc_value"] = 64
 defs["enums"]["ImGuiWindowFlags_"][8]["name"] = "ImGuiWindowFlags_AlwaysAutoResize"
 defs["enums"]["ImGuiWindowFlags_"][8]["value"] = "1 << 6"
 defs["enums"]["ImGuiWindowFlags_"][9] = {}
-defs["enums"]["ImGuiWindowFlags_"][9]["calc_value"] = 256
-defs["enums"]["ImGuiWindowFlags_"][9]["name"] = "ImGuiWindowFlags_NoSavedSettings"
-defs["enums"]["ImGuiWindowFlags_"][9]["value"] = "1 << 8"
+defs["enums"]["ImGuiWindowFlags_"][9]["calc_value"] = 128
+defs["enums"]["ImGuiWindowFlags_"][9]["name"] = "ImGuiWindowFlags_NoBackground"
+defs["enums"]["ImGuiWindowFlags_"][9]["value"] = "1 << 7"
 defs["enums"]["ImGuiWindowFlags_"][10] = {}
-defs["enums"]["ImGuiWindowFlags_"][10]["calc_value"] = 512
-defs["enums"]["ImGuiWindowFlags_"][10]["name"] = "ImGuiWindowFlags_NoInputs"
-defs["enums"]["ImGuiWindowFlags_"][10]["value"] = "1 << 9"
+defs["enums"]["ImGuiWindowFlags_"][10]["calc_value"] = 256
+defs["enums"]["ImGuiWindowFlags_"][10]["name"] = "ImGuiWindowFlags_NoSavedSettings"
+defs["enums"]["ImGuiWindowFlags_"][10]["value"] = "1 << 8"
 defs["enums"]["ImGuiWindowFlags_"][11] = {}
-defs["enums"]["ImGuiWindowFlags_"][11]["calc_value"] = 1024
-defs["enums"]["ImGuiWindowFlags_"][11]["name"] = "ImGuiWindowFlags_MenuBar"
-defs["enums"]["ImGuiWindowFlags_"][11]["value"] = "1 << 10"
+defs["enums"]["ImGuiWindowFlags_"][11]["calc_value"] = 512
+defs["enums"]["ImGuiWindowFlags_"][11]["name"] = "ImGuiWindowFlags_NoMouseInputs"
+defs["enums"]["ImGuiWindowFlags_"][11]["value"] = "1 << 9"
 defs["enums"]["ImGuiWindowFlags_"][12] = {}
-defs["enums"]["ImGuiWindowFlags_"][12]["calc_value"] = 2048
-defs["enums"]["ImGuiWindowFlags_"][12]["name"] = "ImGuiWindowFlags_HorizontalScrollbar"
-defs["enums"]["ImGuiWindowFlags_"][12]["value"] = "1 << 11"
+defs["enums"]["ImGuiWindowFlags_"][12]["calc_value"] = 1024
+defs["enums"]["ImGuiWindowFlags_"][12]["name"] = "ImGuiWindowFlags_MenuBar"
+defs["enums"]["ImGuiWindowFlags_"][12]["value"] = "1 << 10"
 defs["enums"]["ImGuiWindowFlags_"][13] = {}
-defs["enums"]["ImGuiWindowFlags_"][13]["calc_value"] = 4096
-defs["enums"]["ImGuiWindowFlags_"][13]["name"] = "ImGuiWindowFlags_NoFocusOnAppearing"
-defs["enums"]["ImGuiWindowFlags_"][13]["value"] = "1 << 12"
+defs["enums"]["ImGuiWindowFlags_"][13]["calc_value"] = 2048
+defs["enums"]["ImGuiWindowFlags_"][13]["name"] = "ImGuiWindowFlags_HorizontalScrollbar"
+defs["enums"]["ImGuiWindowFlags_"][13]["value"] = "1 << 11"
 defs["enums"]["ImGuiWindowFlags_"][14] = {}
-defs["enums"]["ImGuiWindowFlags_"][14]["calc_value"] = 8192
-defs["enums"]["ImGuiWindowFlags_"][14]["name"] = "ImGuiWindowFlags_NoBringToFrontOnFocus"
-defs["enums"]["ImGuiWindowFlags_"][14]["value"] = "1 << 13"
+defs["enums"]["ImGuiWindowFlags_"][14]["calc_value"] = 4096
+defs["enums"]["ImGuiWindowFlags_"][14]["name"] = "ImGuiWindowFlags_NoFocusOnAppearing"
+defs["enums"]["ImGuiWindowFlags_"][14]["value"] = "1 << 12"
 defs["enums"]["ImGuiWindowFlags_"][15] = {}
-defs["enums"]["ImGuiWindowFlags_"][15]["calc_value"] = 16384
-defs["enums"]["ImGuiWindowFlags_"][15]["name"] = "ImGuiWindowFlags_AlwaysVerticalScrollbar"
-defs["enums"]["ImGuiWindowFlags_"][15]["value"] = "1 << 14"
+defs["enums"]["ImGuiWindowFlags_"][15]["calc_value"] = 8192
+defs["enums"]["ImGuiWindowFlags_"][15]["name"] = "ImGuiWindowFlags_NoBringToFrontOnFocus"
+defs["enums"]["ImGuiWindowFlags_"][15]["value"] = "1 << 13"
 defs["enums"]["ImGuiWindowFlags_"][16] = {}
-defs["enums"]["ImGuiWindowFlags_"][16]["calc_value"] = 32768
-defs["enums"]["ImGuiWindowFlags_"][16]["name"] = "ImGuiWindowFlags_AlwaysHorizontalScrollbar"
-defs["enums"]["ImGuiWindowFlags_"][16]["value"] = "1<< 15"
+defs["enums"]["ImGuiWindowFlags_"][16]["calc_value"] = 16384
+defs["enums"]["ImGuiWindowFlags_"][16]["name"] = "ImGuiWindowFlags_AlwaysVerticalScrollbar"
+defs["enums"]["ImGuiWindowFlags_"][16]["value"] = "1 << 14"
 defs["enums"]["ImGuiWindowFlags_"][17] = {}
-defs["enums"]["ImGuiWindowFlags_"][17]["calc_value"] = 65536
-defs["enums"]["ImGuiWindowFlags_"][17]["name"] = "ImGuiWindowFlags_AlwaysUseWindowPadding"
-defs["enums"]["ImGuiWindowFlags_"][17]["value"] = "1 << 16"
+defs["enums"]["ImGuiWindowFlags_"][17]["calc_value"] = 32768
+defs["enums"]["ImGuiWindowFlags_"][17]["name"] = "ImGuiWindowFlags_AlwaysHorizontalScrollbar"
+defs["enums"]["ImGuiWindowFlags_"][17]["value"] = "1<< 15"
 defs["enums"]["ImGuiWindowFlags_"][18] = {}
-defs["enums"]["ImGuiWindowFlags_"][18]["calc_value"] = 262144
-defs["enums"]["ImGuiWindowFlags_"][18]["name"] = "ImGuiWindowFlags_NoNavInputs"
-defs["enums"]["ImGuiWindowFlags_"][18]["value"] = "1 << 18"
+defs["enums"]["ImGuiWindowFlags_"][18]["calc_value"] = 65536
+defs["enums"]["ImGuiWindowFlags_"][18]["name"] = "ImGuiWindowFlags_AlwaysUseWindowPadding"
+defs["enums"]["ImGuiWindowFlags_"][18]["value"] = "1 << 16"
 defs["enums"]["ImGuiWindowFlags_"][19] = {}
-defs["enums"]["ImGuiWindowFlags_"][19]["calc_value"] = 524288
-defs["enums"]["ImGuiWindowFlags_"][19]["name"] = "ImGuiWindowFlags_NoNavFocus"
-defs["enums"]["ImGuiWindowFlags_"][19]["value"] = "1 << 19"
+defs["enums"]["ImGuiWindowFlags_"][19]["calc_value"] = 262144
+defs["enums"]["ImGuiWindowFlags_"][19]["name"] = "ImGuiWindowFlags_NoNavInputs"
+defs["enums"]["ImGuiWindowFlags_"][19]["value"] = "1 << 18"
 defs["enums"]["ImGuiWindowFlags_"][20] = {}
-defs["enums"]["ImGuiWindowFlags_"][20]["calc_value"] = 786432
-defs["enums"]["ImGuiWindowFlags_"][20]["name"] = "ImGuiWindowFlags_NoNav"
-defs["enums"]["ImGuiWindowFlags_"][20]["value"] = "ImGuiWindowFlags_NoNavInputs | ImGuiWindowFlags_NoNavFocus"
+defs["enums"]["ImGuiWindowFlags_"][20]["calc_value"] = 524288
+defs["enums"]["ImGuiWindowFlags_"][20]["name"] = "ImGuiWindowFlags_NoNavFocus"
+defs["enums"]["ImGuiWindowFlags_"][20]["value"] = "1 << 19"
 defs["enums"]["ImGuiWindowFlags_"][21] = {}
-defs["enums"]["ImGuiWindowFlags_"][21]["calc_value"] = 8388608
-defs["enums"]["ImGuiWindowFlags_"][21]["name"] = "ImGuiWindowFlags_NavFlattened"
-defs["enums"]["ImGuiWindowFlags_"][21]["value"] = "1 << 23"
+defs["enums"]["ImGuiWindowFlags_"][21]["calc_value"] = 786432
+defs["enums"]["ImGuiWindowFlags_"][21]["name"] = "ImGuiWindowFlags_NoNav"
+defs["enums"]["ImGuiWindowFlags_"][21]["value"] = "ImGuiWindowFlags_NoNavInputs | ImGuiWindowFlags_NoNavFocus"
 defs["enums"]["ImGuiWindowFlags_"][22] = {}
-defs["enums"]["ImGuiWindowFlags_"][22]["calc_value"] = 16777216
-defs["enums"]["ImGuiWindowFlags_"][22]["name"] = "ImGuiWindowFlags_ChildWindow"
-defs["enums"]["ImGuiWindowFlags_"][22]["value"] = "1 << 24"
+defs["enums"]["ImGuiWindowFlags_"][22]["calc_value"] = 43
+defs["enums"]["ImGuiWindowFlags_"][22]["name"] = "ImGuiWindowFlags_NoDecoration"
+defs["enums"]["ImGuiWindowFlags_"][22]["value"] = "ImGuiWindowFlags_NoTitleBar | ImGuiWindowFlags_NoResize | ImGuiWindowFlags_NoScrollbar | ImGuiWindowFlags_NoCollapse"
 defs["enums"]["ImGuiWindowFlags_"][23] = {}
-defs["enums"]["ImGuiWindowFlags_"][23]["calc_value"] = 33554432
-defs["enums"]["ImGuiWindowFlags_"][23]["name"] = "ImGuiWindowFlags_Tooltip"
-defs["enums"]["ImGuiWindowFlags_"][23]["value"] = "1 << 25"
+defs["enums"]["ImGuiWindowFlags_"][23]["calc_value"] = 786944
+defs["enums"]["ImGuiWindowFlags_"][23]["name"] = "ImGuiWindowFlags_NoInputs"
+defs["enums"]["ImGuiWindowFlags_"][23]["value"] = "ImGuiWindowFlags_NoMouseInputs | ImGuiWindowFlags_NoNavInputs | ImGuiWindowFlags_NoNavFocus"
 defs["enums"]["ImGuiWindowFlags_"][24] = {}
-defs["enums"]["ImGuiWindowFlags_"][24]["calc_value"] = 67108864
-defs["enums"]["ImGuiWindowFlags_"][24]["name"] = "ImGuiWindowFlags_Popup"
-defs["enums"]["ImGuiWindowFlags_"][24]["value"] = "1 << 26"
+defs["enums"]["ImGuiWindowFlags_"][24]["calc_value"] = 8388608
+defs["enums"]["ImGuiWindowFlags_"][24]["name"] = "ImGuiWindowFlags_NavFlattened"
+defs["enums"]["ImGuiWindowFlags_"][24]["value"] = "1 << 23"
 defs["enums"]["ImGuiWindowFlags_"][25] = {}
-defs["enums"]["ImGuiWindowFlags_"][25]["calc_value"] = 134217728
-defs["enums"]["ImGuiWindowFlags_"][25]["name"] = "ImGuiWindowFlags_Modal"
-defs["enums"]["ImGuiWindowFlags_"][25]["value"] = "1 << 27"
+defs["enums"]["ImGuiWindowFlags_"][25]["calc_value"] = 16777216
+defs["enums"]["ImGuiWindowFlags_"][25]["name"] = "ImGuiWindowFlags_ChildWindow"
+defs["enums"]["ImGuiWindowFlags_"][25]["value"] = "1 << 24"
 defs["enums"]["ImGuiWindowFlags_"][26] = {}
-defs["enums"]["ImGuiWindowFlags_"][26]["calc_value"] = 268435456
-defs["enums"]["ImGuiWindowFlags_"][26]["name"] = "ImGuiWindowFlags_ChildMenu"
-defs["enums"]["ImGuiWindowFlags_"][26]["value"] = "1 << 28"
+defs["enums"]["ImGuiWindowFlags_"][26]["calc_value"] = 33554432
+defs["enums"]["ImGuiWindowFlags_"][26]["name"] = "ImGuiWindowFlags_Tooltip"
+defs["enums"]["ImGuiWindowFlags_"][26]["value"] = "1 << 25"
+defs["enums"]["ImGuiWindowFlags_"][27] = {}
+defs["enums"]["ImGuiWindowFlags_"][27]["calc_value"] = 67108864
+defs["enums"]["ImGuiWindowFlags_"][27]["name"] = "ImGuiWindowFlags_Popup"
+defs["enums"]["ImGuiWindowFlags_"][27]["value"] = "1 << 26"
+defs["enums"]["ImGuiWindowFlags_"][28] = {}
+defs["enums"]["ImGuiWindowFlags_"][28]["calc_value"] = 134217728
+defs["enums"]["ImGuiWindowFlags_"][28]["name"] = "ImGuiWindowFlags_Modal"
+defs["enums"]["ImGuiWindowFlags_"][28]["value"] = "1 << 27"
+defs["enums"]["ImGuiWindowFlags_"][29] = {}
+defs["enums"]["ImGuiWindowFlags_"][29]["calc_value"] = 268435456
+defs["enums"]["ImGuiWindowFlags_"][29]["name"] = "ImGuiWindowFlags_ChildMenu"
+defs["enums"]["ImGuiWindowFlags_"][29]["value"] = "1 << 28"
 defs["structs"] = {}
 defs["structs"]["CustomRect"] = {}
 defs["structs"]["CustomRect"][1] = {}
@@ -1343,8 +1355,8 @@ defs["structs"]["ImFont"][5]["template_type"] = "float"
 defs["structs"]["ImFont"][5]["type"] = "ImVector_float"
 defs["structs"]["ImFont"][6] = {}
 defs["structs"]["ImFont"][6]["name"] = "IndexLookup"
-defs["structs"]["ImFont"][6]["template_type"] = "unsigned short"
-defs["structs"]["ImFont"][6]["type"] = "ImVector_unsigned_short"
+defs["structs"]["ImFont"][6]["template_type"] = "ImWchar"
+defs["structs"]["ImFont"][6]["type"] = "ImVector_ImWchar"
 defs["structs"]["ImFont"][7] = {}
 defs["structs"]["ImFont"][7]["name"] = "FallbackGlyph"
 defs["structs"]["ImFont"][7]["type"] = "const ImFontGlyph*"
@@ -1946,6 +1958,10 @@ defs["structs"]["ImGuiTextBuffer"][1] = {}
 defs["structs"]["ImGuiTextBuffer"][1]["name"] = "Buf"
 defs["structs"]["ImGuiTextBuffer"][1]["template_type"] = "char"
 defs["structs"]["ImGuiTextBuffer"][1]["type"] = "ImVector_char"
+defs["structs"]["ImGuiTextBuffer"][2] = {}
+defs["structs"]["ImGuiTextBuffer"][2]["name"] = "EmptyString[1]"
+defs["structs"]["ImGuiTextBuffer"][2]["size"] = 1
+defs["structs"]["ImGuiTextBuffer"][2]["type"] = "char"
 defs["structs"]["ImGuiTextFilter"] = {}
 defs["structs"]["ImGuiTextFilter"][1] = {}
 defs["structs"]["ImGuiTextFilter"][1]["name"] = "InputBuf[256]"