pull imgui 1.72b

adds generator shell script

Makefile

@@ -46,11 +46,18 @@ endif
 .cpp.o:
 	$(CXX) $(CXXFLAGS) -c -o $@ $<
 
-all:imgui_example
+all:$(OUTPUTNAME)
 	@echo Build complete for $(ECHO_MESSAGE)
 
-imgui_example:$(OBJS)
+$(OUTPUTNAME):$(OBJS)
 	$(CXX) -o $(OUTPUTNAME) $(OBJS) $(CXXFLAGS) $(LINKFLAGS)
 
 clean:
-	rm $(OBJS)
+	rm -f $(OBJS)
+
+fclean: clean
+	rm -f $(OUTPUTNAME)
+
+re: fclean all
+
+.PHONY: all clean fclean re

README.md

@@ -11,7 +11,7 @@ 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.68 of Dear ImGui]
+* currently this wrapper is based on version [1.72b of Dear ImGui]
 * only functions, structs and enums from imgui.h are wrapped.
 * if you are interested in imgui implementations you should look LuaJIT-ImGui project.
 * overloaded function names try to be the most compatible with traditional cimgui names. So all naming is algorithmic except for those names that were in conflict with widely used cimgui names and were thus coded in a table (https://github.com/cimgui/cimgui/blob/master/generator/generator.lua#L58). Current overloaded function names can be found in (https://github.com/cimgui/cimgui/blob/master/generator/output/overloads.txt)
@@ -27,11 +27,11 @@ Notes:
 
 # using generator
 
-* this is only needed if you want an imgui version different from the one provided, otherwise generation is already done.
+* this is only needed (before compilation) if you want an imgui version different from the one provided, otherwise generation is already done.
 * you will need LuaJIT (https://github.com/LuaJIT/LuaJIT.git better 2.1 branch) or precompiled for linux/macOS/windows in https://luapower.com/luajit/download
 * you can use also a C++ compiler for doing preprocessing: gcc (In windows MinGW-W64-builds for example), clang or cl (MSVC) or not use a compiler (experimental nocompiler option) at all. (this repo was done with gcc)
 * update `imgui` folder to the version you desire.
-* edit `generator/generator.bat` (or make a .sh version and please PR) to choose between gcc, clang, cl or nocompiler. Run it with gcc, clang or cl and LuaJIT on your PATH.
+* edit `generator/generator.bat` on windows, or `generator/generator.sh` on linux, to choose between gcc, clang, cl or nocompiler. Run it with gcc, clang or cl and LuaJIT on your PATH.
 * as a result some files are generated: `cimgui.cpp` and `cimgui.h` for compiling and some lua/json files with information about the binding: `definitions.json` with function info, `structs_and_enums.json` with struct and enum info, `impl_definitions.json` with functions from the implementations info. 
 
 # generate binding

generator/cpp2ffi.lua

@@ -466,7 +466,7 @@ local function parseFunction(self,stname,lineorig,namespace)
     defT.defaults = {}
     --for k,def in args:gmatch("([%w%s%*_]+)=([%w_%(%)%s,%*]+)[,%)]") do
     --for k,def in args:gmatch("([%w_]+)=([%w_%(%)%s,%*%.%-]+)[,%)]") do
-    for k,def in args:gmatch('([%w_]+)=([%w_%(%)%s,%*%.%-%+%%"]+)[,%)]') do
+    for k,def in args:gmatch('([%w_]+)=([|<%w_%(%)%s,%*%.%-%+%%"]+)[,%)]') do
         defT.defaults[k]=def
     end
 	defT.templated = self.typenames[stname] and true
@@ -812,6 +812,7 @@ function M.Parser()
 					te = te:gsub("%*","Ptr")
 					self.templates[ttype] = self.templates[ttype] or {}
 					self.templates[ttype][template] = te
+					it2 = it2:gsub("(<[%w_%*%s]+>)([^%s])","%1 %2") --add if not present space after <>
 					it2 = it2:gsub("<([%w_%*%s]+)>","_"..te)
 				end
 				--clean mutable
@@ -937,6 +938,7 @@ function M.Parser()
 			elseif it.re_name == "struct_re" then
 				local cleanst,structname,strtab = self:clean_struct(it.item)
 				--if not void stname or templated
+				--M.prtable(cleanst,structname,strtab)
 				if structname and not self.typenames[structname] then
 					outtab.structs[structname] = {}
 					for j=3,#strtab-1 do

generator/generator.sh

@@ -0,0 +1,17 @@
+#!/usr/bin/sh
+
+# this script must be executed in this directory
+# all the output goes to generator/output folder
+# .cpp and .h files:
+# cimgui.h and cimgui.cpp with gcc preprocess
+# cimgui_nopreprocess.h and cimgui_nopreprocess.cpp generated without preprocess
+# cimgui_impl.h with implementation function cdefs
+# lua and json files:
+# definitions.lua for function definitions
+# structs_and_enums.lua with struct and enum information-definitions
+# impl_definitions.lua for implementation function definitions
+
+#process  files
+# arg[1] compiler name gcc, clang, cl or nocompiler
+# arg[2..n] name of implementations to generate
+luajit ./generator.lua gcc glfw opengl3 opengl2 sdl

generator/generator2.lua

@@ -1,641 +0,0 @@
---------------------------------------------------------------------------
---script for auto_funcs.h and auto_funcs.cpp generation
---expects LuaJIT
---------------------------------------------------------------------------
-assert(_VERSION=='Lua 5.1',"Must use LuaJIT")
-assert(bit,"Must use LuaJIT")
-local script_args = {...}
-local COMPILER = script_args[1]
-local CPRE,CTEST
-if COMPILER == "gcc" or COMPILER == "clang" then
-    CPRE = COMPILER..[[ -E -DIMGUI_DISABLE_OBSOLETE_FUNCTIONS -DIMGUI_API="" -DIMGUI_IMPL_API="" ]]
-    CTEST = COMPILER.." --version"
-elseif COMPILER == "cl" then
-    CPRE = COMPILER..[[ /E /DIMGUI_DISABLE_OBSOLETE_FUNCTIONS /DIMGUI_API="" /DIMGUI_IMPL_API="" ]]
-    CTEST = COMPILER
-else
-    print("Working without compiler ")
-end
---test compiler present
-local HAVE_COMPILER = false
-if CTEST then
-    local pipe,err = io.popen(CTEST,"r")
-    if pipe then
-        local str = pipe:read"*a"
-        print(str)
-        pipe:close()
-        if str=="" then
-            HAVE_COMPILER = false
-        else
-            HAVE_COMPILER = true
-        end
-    else
-        HAVE_COMPILER = false
-        print(err)
-    end
-    assert(HAVE_COMPILER,"gcc, clang or cl needed to run script")
-end --CTEST
-
-print("HAVE_COMPILER",HAVE_COMPILER)
---get implementations
-local implementations = {}
-for i=2,#script_args do table.insert(implementations,script_args[i]) end
-
---------------------------------------------------------------------------
---this table has the functions to be skipped in generation
---------------------------------------------------------------------------
-local cimgui_manuals = {
-    igLogText = true,
-    ImGuiTextBuffer_appendf = true,
-    igColorConvertRGBtoHSV = true,
-    igColorConvertHSVtoRGB = true
-}
---------------------------------------------------------------------------
---this table is a dictionary to force a naming of function overloading (instead of algorythmic generated)
---first level is cimguiname without postfix, second level is the signature of the function, value is the
---desired name
----------------------------------------------------------------------------
-local cimgui_overloads = {
-    igPushID = {
-        --["(const char*)"] =           "igPushIDStr",
-        ["(const char*,const char*)"] = "igPushIDRange",
-        --["(const void*)"] =           "igPushIDPtr",
-        --["(int)"] =                   "igPushIDInt"
-    },
-    igGetID = {
-        ["(const char*,const char*)"] = "igGetIDRange",
-    },
-    ImDrawList_AddText = {
-        ["(const ImVec2,ImU32,const char*,const char*)"] = "ImDrawList_AddText",
-    },
-    igGetColorU32 = {
-        ["(ImGuiCol,float)"] = "igGetColorU32",
-    },
-    igCollapsingHeader = {
-        ["(const char*,ImGuiTreeNodeFlags)"] =  "igCollapsingHeader",
-    },
-    igCombo = {
-        ["(const char*,int*,const char* const[],int,int)"] = "igCombo",
-    },
-    igPlotLines = {
-        ["(const char*,const float*,int,int,const char*,float,float,ImVec2,int)"] = "igPlotLines",
-    },
-    igBeginChild = {
-        ["(const char*,const ImVec2,bool,ImGuiWindowFlags)"] = "igBeginChild",
-    },
-    igSelectable = {
-        ["(const char*,bool,ImGuiSelectableFlags,const ImVec2)"] = "igSelectable"
-    },
-    igPushStyleColor = {
-        ["(ImGuiCol,const ImVec4)"] = "igPushStyleColor"
-    }
-}
-
---------------------------header definitions
-local cimgui_header = 
-[[//This file is automatically generated by generator.lua from https://github.com/cimgui/cimgui
-//based on imgui.h file version XXX from Dear ImGui https://github.com/ocornut/imgui
-]]
-local gdefines = {} --for FLT_MAX and others
---------------------------------------------------------------------------
---helper functions
-
-
----------------------------minimal preprocessor without compiler for ImGui.h
-local function filelines(file,locats)
-    local split_comment = require"cpp2ffi".split_comment
-    local iflevels = {}
-   --generated known prepros
-local prepro = {
-["#if"]={
-    [   "defined(__clang__) || defined(__GNUC__)"       ]=false,
-    [   "defined(__clang__)"    ]=false,
-    [   "defined(_MSC_VER) && !defined(__clang__)"      ]=false,
-    [   "!defined(IMGUI_DISABLE_INCLUDE_IMCONFIG_H) || defined(IMGUI_INCLUDE_IMCONFIG_H)"       ]=false,
-    [   "!defined(IMGUI_IMPL_OPENGL_LOADER_GL3W)     \\"        ]=false,
-},
-["#elif"]={
-    [   "defined(__GNUC__) && __GNUC__ >= 8"    ]=false,
-    [   "(defined(__clang__) || defined(__GNUC__)) && (__cplusplus < 201100)"   ]=false,
-},
-["#ifdef"]={
-    [   "IM_VEC4_CLASS_EXTRA"   ]=false,
-    [   "IMGUI_USER_CONFIG"     ]=false,
-    [   "IMGUI_INCLUDE_IMGUI_USER_H"    ]=false,
-    [   "IMGUI_USE_BGRA_PACKED_COLOR"   ]=false,
-    [   "IM_VEC2_CLASS_EXTRA"   ]=false,
-},
-["#ifndef"]={
-    [   "IMGUI_API"     ]=false,
-    [   "IMGUI_IMPL_API"        ]=false,
-    [   "IMGUI_OVERRIDE_DRAWVERT_STRUCT_LAYOUT" ]=true,
-    [   "IM_ASSERT"     ]=false,
-    [   "ImTextureID"   ]=true,
-    [   "ImDrawIdx"     ]=true,
-    [   "IMGUI_DISABLE_OBSOLETE_FUNCTIONS"      ]=false,
-},
-}
-
-    local function prepro_boolif(pre,cond)
-        local conds = prepro[pre]
-        assert(conds,pre.." has no conds-----------------------------")
-        local res = conds[cond]
-        --assert(type(res)~="nil",cond.." not found")
-        if type(res)=="nil" then
-            print(pre,cond,"not found in precompiler database, returning false.")
-            res = false
-        end
-        return res
-    end
-    local function location_it()
-        repeat
-            local line = file:read"*l"
-
-            if not line then return nil end
-            line,_ = split_comment(line)
-            --if line:sub(1,1) == "#" then
-            if line:match("^%s*#") then
-                
-                local pre,cond = line:match("^%s*(#%S*)%s+(.*)%s*$")
-                if line:match("#if") then 
-                    iflevels[#iflevels +1 ] = prepro_boolif(pre,cond)
-                elseif line:match("#endif") then
-                    iflevels[#iflevels] = nil
-                elseif line:match("#elif") then
-                    if not iflevels[#iflevels] then
-                        iflevels[#iflevels] = prepro_boolif(pre,cond)
-                    else --was true
-                        iflevels[#iflevels] = false
-                    end
-                elseif line:match("#else") then
-                    iflevels[#iflevels] = not iflevels[#iflevels]
-                else
-                    if not (pre:match("#define") or pre:match"#include" or pre:match"#pragma") then
-                        print("not expected preprocessor directive ",pre)
-                    end
-                end
-                -- skip
-            elseif #iflevels == 0 or iflevels[#iflevels] then
-                -- drop IMGUI_APIX
-                line = line:gsub("IMGUI_IMPL_API","")
-                -- drop IMGUI_API
-                line = line:gsub("IMGUI_API","")
-                return line,locats[1]
-            end
-        until false
-    end
-    return location_it
-end
-
-
---------------------------------functions for C generation
-local function func_header_impl_generate(FP)
-
-    local outtab = {}
-    
-    for _,t in ipairs(FP.funcdefs) do
-        if t.cimguiname then
-            local cimf = FP.defsT[t.cimguiname]
-            local def = cimf[t.signature]
-            if def.ret then --not constructor
-                local addcoment = def.comment or ""
-                if def.stname == "" then --ImGui namespace or top level
-                    table.insert(outtab,"CIMGUI_API".." "..def.ret.." "..def.ov_cimguiname..def.args..";"..addcoment.."\n")
-                else
-                    error("class function in implementations")
-                end
-            end
-        else --not cimguiname
-            table.insert(outtab,t.comment:gsub("%%","%%%%").."\n")-- %% substitution for gsub
-        end
-    end
-    local cfuncsstr = table.concat(outtab)
-    cfuncsstr = cfuncsstr:gsub("\n+","\n") --several empty lines to one empty line
-    return cfuncsstr
-end
-local function func_header_generate(FP)
-
-    local outtab = {}
-    table.insert(outtab,"#ifndef CIMGUI_DEFINE_ENUMS_AND_STRUCTS\n")
-    for k,v in pairs(FP.embeded_structs) do
-        table.insert(outtab,"typedef "..v.." "..k..";\n")
-    end
-    for ttype,v in pairs(FP.templates) do
-		for ttypein,_ in pairs(v) do
-			local te = ttypein:gsub("%s","_")
-			te = te:gsub("%*","Ptr")
-        table.insert(outtab,"typedef "..ttype.."<"..ttypein.."> "..ttype.."_"..te..";\n")
-		end
-    end
-
-    table.insert(outtab,"#endif //CIMGUI_DEFINE_ENUMS_AND_STRUCTS\n")
-    for _,t in ipairs(FP.funcdefs) do
-
-        if t.cimguiname then
-        local cimf = FP.defsT[t.cimguiname]
-        local def = cimf[t.signature]
-        assert(def,t.signature..t.cimguiname)
-        local manual = FP.get_manuals(def)
-        if not manual and not def.templated then
-
-            local addcoment = def.comment or ""
-            local empty = def.args:match("^%(%)") --no args
-            if def.constructor then
-                assert(def.stname ~= "","constructor without struct")
-                table.insert(outtab,"CIMGUI_API "..def.stname.."* "..def.ov_cimguiname ..(empty and "(void)" or def.args)..";"..addcoment.."\n")
-            elseif def.destructor then
-                table.insert(outtab,"CIMGUI_API void "..def.ov_cimguiname..def.args..";"..addcoment.."\n")
-            else --not constructor
-
-                if def.stname == "" then --ImGui namespace or top level
-                    table.insert(outtab,"CIMGUI_API "..def.ret.." ".. def.ov_cimguiname ..(empty and "(void)" or def.args)..";"..addcoment.."\n")
-                else
-                    table.insert(outtab,"CIMGUI_API "..def.ret.." "..def.ov_cimguiname..def.args..";"..addcoment.."\n")
-                end
-            end 
-        end
-        else --not cimguiname
-            table.insert(outtab,t.comment:gsub("%%","%%%%").."\n")-- %% substitution for gsub
-        end
-    end
-
-    local cfuncsstr = table.concat(outtab)
-    cfuncsstr = cfuncsstr:gsub("\n+","\n") --several empty lines to one empty line
-    return cfuncsstr
-end
-
-
-local function ImGui_f_implementation(outtab,def)
-    local ptret = def.retref and "&" or ""
-    table.insert(outtab,"CIMGUI_API".." "..def.ret.." "..def.ov_cimguiname..def.args.."\n")
-    table.insert(outtab,"{\n")
-    if def.isvararg then
-        local call_args = def.call_args:gsub("%.%.%.","args")
-        table.insert(outtab,"    va_list args;\n")
-        table.insert(outtab,"    va_start(args, fmt);\n")
-        if def.ret~="void" then
-            table.insert(outtab,"    "..def.ret.." ret = ImGui::"..def.funcname.."V"..call_args..";\n")
-        else
-            table.insert(outtab,"    ImGui::"..def.funcname.."V"..call_args..";\n")
-        end
-        table.insert(outtab,"    va_end(args);\n")
-        if def.ret~="void" then
-            table.insert(outtab,"    return ret;\n")
-        end
-    elseif def.nonUDT then
-        if def.nonUDT == 1 then
-            table.insert(outtab,"    *pOut = ImGui::"..def.funcname..def.call_args..";\n")
-        else --nonUDT==2
-            table.insert(outtab,"    "..def.retorig.." ret = ImGui::"..def.funcname..def.call_args..";\n")
-            table.insert(outtab,"    "..def.ret.." ret2 = "..def.retorig.."ToSimple(ret);\n")
-            table.insert(outtab,"    return ret2;\n")
-        end
-    else --standard ImGui
-        table.insert(outtab,"    return "..ptret.."ImGui::"..def.funcname..def.call_args..";\n")
-    end
-    table.insert(outtab,"}\n")
-end
-local function struct_f_implementation(outtab,def)
-    local empty = def.args:match("^%(%)") --no args
-    local ptret = def.retref and "&" or ""
-
-    local imgui_stname = def.stname
-
-    table.insert(outtab,"CIMGUI_API".." "..def.ret.." "..def.ov_cimguiname..def.args.."\n")
-    table.insert(outtab,"{\n")
-    if def.isvararg then
-        local call_args = def.call_args:gsub("%.%.%.","args")
-        table.insert(outtab,"    va_list args;\n")
-        table.insert(outtab,"    va_start(args, fmt);\n")
-        if def.ret~="void" then
-            table.insert(outtab,"    "..def.ret.." ret = self->"..def.funcname.."V"..call_args..";\n")
-        else
-            table.insert(outtab,"    self->"..def.funcname.."V"..call_args..";\n")
-        end
-        table.insert(outtab,"    va_end(args);\n")
-        if def.ret~="void" then
-            table.insert(outtab,"    return ret;\n")
-        end
-    elseif def.nonUDT then
-        if def.nonUDT == 1 then
-            table.insert(outtab,"    *pOut = self->"..def.funcname..def.call_args..";\n")
-        else --nonUDT==2
-            table.insert(outtab,"    "..def.retorig.." ret = self->"..def.funcname..def.call_args..";\n")
-            table.insert(outtab,"    "..def.ret.." ret2 = "..def.retorig.."ToSimple(ret);\n")
-            table.insert(outtab,"    return ret2;\n")
-        end
-    else --standard struct
-        table.insert(outtab,"    return "..ptret.."self->"..def.funcname..def.call_args..";\n")
-    end
-    table.insert(outtab,"}\n")
-end
-local function func_implementation(FP)
-
-    local outtab = {}
-    for _,t in ipairs(FP.funcdefs) do
-        repeat -- continue simulation
-        if not t.cimguiname then break end
-        local cimf = FP.defsT[t.cimguiname]
-        local def = cimf[t.signature]
-        assert(def)
-        local manual = FP.get_manuals(def)
-        if not manual and not def.templated then 
-            if def.constructor then
-                assert(def.stname ~= "","constructor without struct")
-                local empty = def.args:match("^%(%)") --no args
-                table.insert(outtab,"CIMGUI_API "..def.stname.."* "..def.ov_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")
-            elseif def.destructor then
-                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")
-            elseif def.stname == "" then
-                ImGui_f_implementation(outtab,def)
-            else -- stname
-                struct_f_implementation(outtab,def)
-            end
-        end
-        until true
-    end
-    return table.concat(outtab)
-end
--------------------functions for getting and setting defines
-local function get_defines(t)
-    if COMPILER == "cl" then print"can't get defines with cl compiler"; return {} end
-    local pipe,err = io.popen(COMPILER..[[ -E -dM -DIMGUI_DISABLE_OBSOLETE_FUNCTIONS -DIMGUI_API="" -DIMGUI_IMPL_API="" ../imgui/imgui.h]],"r")
-    local defines = {}
-    while true do
-        local line = pipe:read"*l"
-        if not line then break end
-        local key,value = line:match([[#define%s+(%S+)%s+(.+)]])
-        if not key or not value then 
-            --print(line)
-        else
-            defines[key]=value
-        end
-    end
-    pipe:close()
-    --require"anima.utils"
-    --prtable(defines)
-    --FLT_MAX
-    local ret = {}
-    for i,v in ipairs(t) do
-        local aa = defines[v]
-        while true do
-            local tmp = defines[aa]
-            if not tmp then 
-                break
-            else
-                aa = tmp
-            end
-        end
-        ret[v] = aa
-    end
-    return ret
-end
-  --subtitution of FLT_MAX value for FLT_MAX 
-local function set_defines(fdefs)
-    for k,defT in pairs(fdefs) do
-        for i,def in ipairs(defT) do
-            for name,default in pairs(def.defaults) do
-                if default == gdefines.FLT_MAX then
-                    def.defaults[name] = "FLT_MAX"
-                end
-            end
-        end
-    end
-end 
---this creates defsBystruct in case you need to list by struct container
-local function DefsByStruct(FP)
-    local structs = {}
-    for fun,defs in pairs(FP.defsT) do
-        local stname = defs[1].stname
-        structs[stname] = structs[stname] or {}
-        table.insert(structs[stname],defs)--fun)
-    end
-    FP.defsBystruct = structs
-end  
-
-
---load parser module
-local cpp2ffi = require"cpp2ffi"
-local read_data = cpp2ffi.read_data
-local save_data = cpp2ffi.save_data
-local copyfile = cpp2ffi.copyfile
-local serializeTableF = cpp2ffi.serializeTableF
-
-----------custom ImVector templates
-local function generate_templates(code,templates)
-    table.insert(code,[[typedef struct ImVector{int Size;int Capacity;void* Data;} ImVector;]].."\n")
-    for ttype,v in pairs(templates) do
-        --local te = k:gsub("%s","_")
-        --te = te:gsub("%*","Ptr")
-		if ttype == "ImVector" then
-		for te,newte in pairs(v) do
-        table.insert(code,"typedef struct ImVector_"..newte.." {int Size;int Capacity;"..te.."* Data;} ImVector_"..newte..";\n")
-		end
-		end
-    end
-end
---generate cimgui.cpp cimgui.h 
-local function cimgui_generation(parser)
-	cpp2ffi.prtable(parser.templates)
-	cpp2ffi.prtable(parser.typenames)
-	-- clean ImVector:contains() for not applicable types
-	local clean_f = {}
-	for k,v in pairs(parser.defsT) do
-		if k:match"ImVector" and k:match"contains" then
-			--cpp2ffi.prtable(k,v)
-			local stname = v[1].stname
-			if not(stname:match"float" or stname:match"int" or stname:match"char") then
-				parser.defsT[k] = nil
-				--delete also from funcdefs
-				for i,t in ipairs(parser.funcdefs) do
-					if t.cimguiname == k then
-						table.remove(parser.funcdefs, i)
-						break
-					end
-				end
-			end
-		end
-	end
-	
-	--------------------------------------------------
-    local hstrfile = read_data"./cimgui_template.h"
-
-	local outpre,outpost = parser:gen_structs_and_enums()
-	--parser.templates get completely defined here
-	--cpp2ffi.prtable(parser.templates)
-	
-	local outtab = {}
-    generate_templates(outtab,parser.templates)
-	local cstructsstr = outpre..table.concat(outtab,"")..outpost
-
-    hstrfile = hstrfile:gsub([[#include "imgui_structs%.h"]],cstructsstr)
-    local cfuncsstr = func_header_generate(parser)
-    hstrfile = hstrfile:gsub([[#include "auto_funcs%.h"]],cfuncsstr)
-    save_data("./output/cimgui.h",cimgui_header,hstrfile)
-    
-    --merge it in cimgui_template.cpp to cimgui.cpp
-    local cimplem = func_implementation(parser)
-
-    local hstrfile = read_data"./cimgui_template.cpp"
-
-    hstrfile = hstrfile:gsub([[#include "auto_funcs%.cpp"]],cimplem)
-    save_data("./output/cimgui.cpp",cimgui_header,hstrfile)
-
-end
---------------------------------------------------------
------------------------------do it----------------------
---------------------------------------------------------
---get imgui.h version--------------------------
-local pipe,err = io.open("../imgui/imgui.h","r")
-if not pipe then
-    error("could not open file:"..err)
-end
-local imgui_version
-while true do
-    local line = pipe:read"*l"
-    imgui_version = line:match([[#define%s+IMGUI_VERSION%s+(".+")]])
-    if imgui_version then break end
-end
-pipe:close()
-cimgui_header = cimgui_header:gsub("XXX",imgui_version)
-print("IMGUI_VERSION",imgui_version)
---get some defines----------------------------
-if HAVE_COMPILER then
-    gdefines = get_defines{"IMGUI_VERSION","FLT_MAX"}
-end                                 
-
---generation
-print("------------------generation with "..COMPILER.."------------------------")
-local typedefs_dict2
---prepare parser
-local parser1 = cpp2ffi.Parser()
-parser1.getCname = function(stname,funcname)
-    local pre = (stname == "") and "ig" or stname.."_"
-    return pre..funcname
-end
-parser1.cname_overloads = cimgui_overloads
-parser1.manuals = cimgui_manuals
-parser1.UDTs = {"ImVec2","ImVec4","ImColor"}
-
-local pipe,err
-if HAVE_COMPILER then
-    pipe,err = io.popen(CPRE..[[../imgui/imgui.h]],"r")
-else
-    pipe,err = io.open([[../imgui/imgui.h]],"r")
-end
-
-if not pipe then
-    error("could not execute gcc "..err)
-end
-
-local iterator = (HAVE_COMPILER and cpp2ffi.location) or filelines
-
-for line in iterator(pipe,{"imgui"},{}) do
-	parser1:insert(line)
-end
-pipe:close()
-
-parser1:do_parse()
---table.sort(parser1.funcdefs, function(a,b) return a.cimguiname < b.cimguiname end)
---parser1:dump_alltypes()
---parser1:printItems()
-
-save_data("./output/overloads.txt",parser1.overloadstxt)
-cimgui_generation(parser1)
-
-----------save fundefs in definitions.lua for using in bindings
---DefsByStruct(pFP)
-set_defines(parser1.defsT) 
-save_data("./output/definitions.lua",serializeTableF(parser1.defsT))
-
-----------save struct and enums lua table in structs_and_enums.lua for using in bindings
-local structs_and_enums_table = parser1:gen_structs_and_enums_table()
---correct Pair union member
-structs_and_enums_table["structs"]["Pair"][2]["name"] = ""
-structs_and_enums_table["structs"]["Pair"][2]["type"] = structs_and_enums_table["structs"]["Pair"][2]["type"] .. "}"
------------------------
-save_data("./output/structs_and_enums.lua",serializeTableF(structs_and_enums_table))
-save_data("./output/typedefs_dict.lua",serializeTableF(parser1.typedefs_dict))
-
---check every function has ov_cimguiname
--- for k,v in pairs(parser1.defsT) do
-	-- for _,def in ipairs(v) do
-		-- assert(def.ov_cimguiname)
-	-- end
--- end
---=================================Now implementations
-
-local parser2
-
-if #implementations > 0 then
-
-    parser2 = cpp2ffi.Parser()
-
-    
-    for i,impl in ipairs(implementations) do
-        local source = [[../imgui/examples/imgui_impl_]].. impl .. ".h "
-        local locati = [[imgui_impl_]].. impl
-        local pipe,err
-        if HAVE_COMPILER then
-            pipe,err = io.popen(CPRE..source,"r")
-        else
-            pipe,err = io.open(source,"r")
-        end
-        if not pipe then
-            error("could not get file: "..err)
-        end
-        
-        local iterator = (HAVE_COMPILER and cpp2ffi.location) or filelines
-        
-        for line,locat in iterator(pipe,{locati},{}) do
-            --local line, comment = split_comment(line)
-			parser2:insert(line)
-        end
-        pipe:close()
-    end
-    parser2:do_parse()
-
-    -- save ./cimgui_impl.h
-    local cfuncsstr = func_header_impl_generate(parser2) 
-    local cstructstr1,cstructstr2 = parser2:gen_structs_and_enums()
-    save_data("./output/cimgui_impl.h",cstructstr1,cstructstr2,cfuncsstr)
-
-    ----------save fundefs in impl_definitions.lua for using in bindings
-    save_data("./output/impl_definitions.lua",serializeTableF(parser2.defsT))
-
-end -- #implementations > 0 then
-
--------------------------------json saving
---avoid mixed tables (with string and integer keys)
-local function json_prepare(defs)
-    --delete signatures in function
-    for k,def in pairs(defs) do
-        for k2,v in pairs(def) do
-            if type(k2)=="string" then
-                def[k2] = nil
-            end
-        end
-    end
-    return defs
-end
----[[
-local json = require"json"
-save_data("./output/definitions.json",json.encode(json_prepare(parser1.defsT)))
-save_data("./output/structs_and_enums.json",json.encode(structs_and_enums_table))
-save_data("./output/typedefs_dict.json",json.encode(parser1.typedefs_dict))
-if parser2 then
-    save_data("./output/impl_definitions.json",json.encode(json_prepare(parser2.defsT)))
-end
---]]
--------------------copy C files to repo root
-copyfile("./output/cimgui.h", "../cimgui.h")
-copyfile("./output/cimgui.cpp", "../cimgui.cpp")
-print"all done!!"

generator/generator_old.bat

@@ -16,7 +16,7 @@ set PATH=%PATH%;C:\luaGL;C:\mingw32\bin;
 ::process  files
 :: arg[1] compiler name gcc, clang, cl or nocompiler
 :: arg[2..n] name of implementations to generate
-luajit ./generator2.lua gcc glfw opengl3 opengl2 sdl
+luajit ./generator_old.lua gcc glfw opengl3 opengl2 sdl
 
 ::leave console open
 cmd /k

generator/output/cimgui_impl.h

@@ -30,6 +30,7 @@ CIMGUI_API bool ImGui_ImplOpenGL2_CreateDeviceObjects();
 CIMGUI_API void ImGui_ImplOpenGL2_DestroyDeviceObjects();
 CIMGUI_API bool ImGui_ImplSDL2_InitForOpenGL(SDL_Window* window,void* sdl_gl_context);
 CIMGUI_API bool ImGui_ImplSDL2_InitForVulkan(SDL_Window* window);
+CIMGUI_API bool ImGui_ImplSDL2_InitForD3D(SDL_Window* window);
 CIMGUI_API void ImGui_ImplSDL2_Shutdown();
 CIMGUI_API void ImGui_ImplSDL2_NewFrame(SDL_Window* window);
 CIMGUI_API bool ImGui_ImplSDL2_ProcessEvent(const SDL_Event* event);

generator/output/impl_definitions.json

@@ -454,6 +454,26 @@
       "stname": ""
     }
   ],
+  "ImGui_ImplSDL2_InitForD3D": [
+    {
+      "args": "(SDL_Window* window)",
+      "argsT": [
+        {
+          "name": "window",
+          "type": "SDL_Window*"
+        }
+      ],
+      "argsoriginal": "(SDL_Window* window)",
+      "call_args": "(window)",
+      "cimguiname": "ImGui_ImplSDL2_InitForD3D",
+      "defaults": [],
+      "funcname": "ImGui_ImplSDL2_InitForD3D",
+      "ov_cimguiname": "ImGui_ImplSDL2_InitForD3D",
+      "ret": "bool",
+      "signature": "(SDL_Window*)",
+      "stname": ""
+    }
+  ],
   "ImGui_ImplSDL2_InitForOpenGL": [
     {
       "args": "(SDL_Window* window,void* sdl_gl_context)",

generator/output/impl_definitions.lua

@@ -399,6 +399,23 @@ defs["ImGui_ImplOpenGL3_Shutdown"][1]["ret"] = "void"
 defs["ImGui_ImplOpenGL3_Shutdown"][1]["signature"] = "()"
 defs["ImGui_ImplOpenGL3_Shutdown"][1]["stname"] = ""
 defs["ImGui_ImplOpenGL3_Shutdown"]["()"] = defs["ImGui_ImplOpenGL3_Shutdown"][1]
+defs["ImGui_ImplSDL2_InitForD3D"] = {}
+defs["ImGui_ImplSDL2_InitForD3D"][1] = {}
+defs["ImGui_ImplSDL2_InitForD3D"][1]["args"] = "(SDL_Window* window)"
+defs["ImGui_ImplSDL2_InitForD3D"][1]["argsT"] = {}
+defs["ImGui_ImplSDL2_InitForD3D"][1]["argsT"][1] = {}
+defs["ImGui_ImplSDL2_InitForD3D"][1]["argsT"][1]["name"] = "window"
+defs["ImGui_ImplSDL2_InitForD3D"][1]["argsT"][1]["type"] = "SDL_Window*"
+defs["ImGui_ImplSDL2_InitForD3D"][1]["argsoriginal"] = "(SDL_Window* window)"
+defs["ImGui_ImplSDL2_InitForD3D"][1]["call_args"] = "(window)"
+defs["ImGui_ImplSDL2_InitForD3D"][1]["cimguiname"] = "ImGui_ImplSDL2_InitForD3D"
+defs["ImGui_ImplSDL2_InitForD3D"][1]["defaults"] = {}
+defs["ImGui_ImplSDL2_InitForD3D"][1]["funcname"] = "ImGui_ImplSDL2_InitForD3D"
+defs["ImGui_ImplSDL2_InitForD3D"][1]["ov_cimguiname"] = "ImGui_ImplSDL2_InitForD3D"
+defs["ImGui_ImplSDL2_InitForD3D"][1]["ret"] = "bool"
+defs["ImGui_ImplSDL2_InitForD3D"][1]["signature"] = "(SDL_Window*)"
+defs["ImGui_ImplSDL2_InitForD3D"][1]["stname"] = ""
+defs["ImGui_ImplSDL2_InitForD3D"]["(SDL_Window*)"] = defs["ImGui_ImplSDL2_InitForD3D"][1]
 defs["ImGui_ImplSDL2_InitForOpenGL"] = {}
 defs["ImGui_ImplSDL2_InitForOpenGL"][1] = {}
 defs["ImGui_ImplSDL2_InitForOpenGL"][1]["args"] = "(SDL_Window* window,void* sdl_gl_context)"

generator/output/overloads.txt

@@ -1,34 +1,72 @@
 ----------------overloadings---------------------------
-igCombo	3
-1	bool	igCombo (const char*,int*,const char* const[],int,int)
-2	bool	igComboStr (const char*,int*,const char*,int)
-3	bool	igComboFnPtr (const char*,int*,bool(*)(void*,int,const char**),void*,int,int)
-TextRange_TextRange	2
-1	nil	TextRange_TextRange ()
-2	nil	TextRange_TextRangeStr (const char*,const char*)
+ImVector_resize	2
+1	void	ImVector_resize (int)
+2	void	ImVector_resizeT (int,const T)
 ImVec4_ImVec4	2
 1	nil	ImVec4_ImVec4 ()
 2	nil	ImVec4_ImVec4Float (float,float,float,float)
-igSetWindowFocus	2
-1	void	igSetWindowFocus ()
-2	void	igSetWindowFocusStr (const char*)
 igValue	4
 1	void	igValueBool (const char*,bool)
 2	void	igValueInt (const char*,int)
 3	void	igValueUint (const char*,unsigned int)
 4	void	igValueFloat (const char*,float,const char*)
-igPushStyleVar	2
-1	void	igPushStyleVarFloat (ImGuiStyleVar,float)
-2	void	igPushStyleVarVec2 (ImGuiStyleVar,const ImVec2)
-ImVector_end	2
-1	T*	ImVector_end ()
-2	const T*	ImVector_end_const ()const
 igIsRectVisible	2
 1	bool	igIsRectVisible (const ImVec2)
 2	bool	igIsRectVisibleVec2 (const ImVec2,const ImVec2)
 igRadioButton	2
 1	bool	igRadioButtonBool (const char*,bool)
 2	bool	igRadioButtonIntPtr (const char*,int*,int)
+ImGuiTextRange_ImGuiTextRange	2
+1	nil	ImGuiTextRange_ImGuiTextRange ()
+2	nil	ImGuiTextRange_ImGuiTextRangeStr (const char*,const char*)
+ImVector_back	2
+1	T*	ImVector_back ()
+2	const T*	ImVector_back_const ()const
+igPlotHistogram	2
+1	void	igPlotHistogramFloatPtr (const char*,const float*,int,int,const char*,float,float,ImVec2,int)
+2	void	igPlotHistogramFnPtr (const char*,float(*)(void*,int),void*,int,int,const char*,float,float,ImVec2)
+igGetID	3
+1	ImGuiID	igGetIDStr (const char*)
+2	ImGuiID	igGetIDRange (const char*,const char*)
+3	ImGuiID	igGetIDPtr (const void*)
+igSetWindowPos	2
+1	void	igSetWindowPosVec2 (const ImVec2,ImGuiCond)
+2	void	igSetWindowPosStr (const char*,const ImVec2,ImGuiCond)
+igBeginChild	2
+1	bool	igBeginChild (const char*,const ImVec2,bool,ImGuiWindowFlags)
+2	bool	igBeginChildID (ImGuiID,const ImVec2,bool,ImGuiWindowFlags)
+igPushID	4
+1	void	igPushIDStr (const char*)
+2	void	igPushIDRange (const char*,const char*)
+3	void	igPushIDPtr (const void*)
+4	void	igPushIDInt (int)
+ImGuiStoragePair_ImGuiStoragePair	3
+1	nil	ImGuiStoragePair_ImGuiStoragePairInt (ImGuiID,int)
+2	nil	ImGuiStoragePair_ImGuiStoragePairFloat (ImGuiID,float)
+3	nil	ImGuiStoragePair_ImGuiStoragePairPtr (ImGuiID,void*)
+igTreeNode	3
+1	bool	igTreeNodeStr (const char*)
+2	bool	igTreeNodeStrStr (const char*,const char*,...)
+3	bool	igTreeNodePtr (const void*,const char*,...)
+igCombo	3
+1	bool	igCombo (const char*,int*,const char* const[],int,int)
+2	bool	igComboStr (const char*,int*,const char*,int)
+3	bool	igComboFnPtr (const char*,int*,bool(*)(void*,int,const char**),void*,int,int)
+ImVector_erase	2
+1	T*	ImVector_erase (const T*)
+2	T*	ImVector_eraseTPtr (const T*,const T*)
+ImDrawList_AddText	2
+1	void	ImDrawList_AddText (const ImVec2,ImU32,const char*,const char*)
+2	void	ImDrawList_AddTextFontPtr (const ImFont*,float,const ImVec2,ImU32,const char*,const char*,float,const ImVec4*)
+igPushStyleVar	2
+1	void	igPushStyleVarFloat (ImGuiStyleVar,float)
+2	void	igPushStyleVarVec2 (ImGuiStyleVar,const ImVec2)
+igSetWindowFocus	2
+1	void	igSetWindowFocus ()
+2	void	igSetWindowFocusStr (const char*)
+ImVector_end	2
+1	T*	ImVector_end ()
+2	const T*	ImVector_end_const ()const
 igSetWindowSize	2
 1	void	igSetWindowSizeVec2 (const ImVec2,ImGuiCond)
 2	void	igSetWindowSizeStr (const char*,const ImVec2,ImGuiCond)
@@ -41,91 +79,53 @@ 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)
-ImVector_back	2
-1	T*	ImVector_back ()
-2	const T*	ImVector_back_const ()const
-igPlotHistogram	2
-1	void	igPlotHistogramFloatPtr (const char*,const float*,int,int,const char*,float,float,ImVec2,int)
-2	void	igPlotHistogramFnPtr (const char*,float(*)(void*,int),void*,int,int,const char*,float,float,ImVec2)
-igTreeNodeExV	2
-1	bool	igTreeNodeExVStr (const char*,ImGuiTreeNodeFlags,const char*,va_list)
-2	bool	igTreeNodeExVPtr (const void*,ImGuiTreeNodeFlags,const char*,va_list)
-igGetID	3
-1	ImGuiID	igGetIDStr (const char*)
-2	ImGuiID	igGetIDRange (const char*,const char*)
-3	ImGuiID	igGetIDPtr (const void*)
-ImDrawList_AddText	2
-1	void	ImDrawList_AddText (const ImVec2,ImU32,const char*,const char*)
-2	void	ImDrawList_AddTextFontPtr (const ImFont*,float,const ImVec2,ImU32,const char*,const char*,float,const ImVec4*)
-ImVector_begin	2
-1	T*	ImVector_begin ()
-2	const T*	ImVector_begin_const ()const
-igBeginChild	2
-1	bool	igBeginChild (const char*,const ImVec2,bool,ImGuiWindowFlags)
-2	bool	igBeginChildID (ImGuiID,const ImVec2,bool,ImGuiWindowFlags)
-igPushStyleColor	2
-1	void	igPushStyleColorU32 (ImGuiCol,ImU32)
-2	void	igPushStyleColor (ImGuiCol,const ImVec4)
-igSelectable	2
-1	bool	igSelectable (const char*,bool,ImGuiSelectableFlags,const ImVec2)
-2	bool	igSelectableBoolPtr (const char*,bool*,ImGuiSelectableFlags,const ImVec2)
-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)
-Pair_Pair	3
-1	nil	Pair_PairInt (ImGuiID,int)
-2	nil	Pair_PairFloat (ImGuiID,float)
-3	nil	Pair_PairPtr (ImGuiID,void*)
-igPushID	4
-1	void	igPushIDStr (const char*)
-2	void	igPushIDRange (const char*,const char*)
-3	void	igPushIDPtr (const void*)
-4	void	igPushIDInt (int)
-igSetWindowPos	2
-1	void	igSetWindowPosVec2 (const ImVec2,ImGuiCond)
-2	void	igSetWindowPosStr (const char*,const ImVec2,ImGuiCond)
 igListBoxHeader	2
 1	bool	igListBoxHeaderVec2 (const char*,const ImVec2)
 2	bool	igListBoxHeaderInt (const char*,int,int)
-ImVector_erase	2
-1	T*	ImVector_erase (const T*)
-2	T*	ImVector_eraseTPtr (const T*,const T*)
-ImVector_resize	2
-1	void	ImVector_resize (int)
-2	void	ImVector_resizeT (int,const T)
-ImVector_front	2
-1	T*	ImVector_front ()
-2	const T*	ImVector_front_const ()const
+igTreeNodeExV	2
+1	bool	igTreeNodeExVStr (const char*,ImGuiTreeNodeFlags,const char*,va_list)
+2	bool	igTreeNodeExVPtr (const void*,ImGuiTreeNodeFlags,const char*,va_list)
+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)
+igCollapsingHeader	2
+1	bool	igCollapsingHeader (const char*,ImGuiTreeNodeFlags)
+2	bool	igCollapsingHeaderBoolPtr (const char*,bool*,ImGuiTreeNodeFlags)
 igTreePush	2
 1	void	igTreePushStr (const char*)
 2	void	igTreePushPtr (const void*)
+igSelectable	2
+1	bool	igSelectable (const char*,bool,ImGuiSelectableFlags,const ImVec2)
+2	bool	igSelectableBoolPtr (const char*,bool*,ImGuiSelectableFlags,const ImVec2)
+igGetColorU32	3
+1	ImU32	igGetColorU32 (ImGuiCol,float)
+2	ImU32	igGetColorU32Vec4 (const ImVec4)
+3	ImU32	igGetColorU32U32 (ImU32)
 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)
-igCollapsingHeader	2
-1	bool	igCollapsingHeader (const char*,ImGuiTreeNodeFlags)
-2	bool	igCollapsingHeaderBoolPtr (const char*,bool*,ImGuiTreeNodeFlags)
-igMenuItem	2
-1	bool	igMenuItemBool (const char*,const char*,bool,bool)
-2	bool	igMenuItemBoolPtr (const char*,const char*,bool*,bool)
+ImVec2_ImVec2	2
+1	nil	ImVec2_ImVec2 ()
+2	nil	ImVec2_ImVec2Float (float,float)
+ImVector_front	2
+1	T*	ImVector_front ()
+2	const T*	ImVector_front_const ()const
+ImVector_begin	2
+1	T*	ImVector_begin ()
+2	const T*	ImVector_begin_const ()const
+igPushStyleColor	2
+1	void	igPushStyleColorU32 (ImGuiCol,ImU32)
+2	void	igPushStyleColor (ImGuiCol,const ImVec4)
 igTreeNodeEx	3
 1	bool	igTreeNodeExStr (const char*,ImGuiTreeNodeFlags)
 2	bool	igTreeNodeExStrStr (const char*,ImGuiTreeNodeFlags,const char*,...)
 3	bool	igTreeNodeExPtr (const void*,ImGuiTreeNodeFlags,const char*,...)
-igGetColorU32	3
-1	ImU32	igGetColorU32 (ImGuiCol,float)
-2	ImU32	igGetColorU32Vec4 (const ImVec4)
-3	ImU32	igGetColorU32U32 (ImU32)
-igTreeNode	3
-1	bool	igTreeNodeStr (const char*)
-2	bool	igTreeNodeStrStr (const char*,const char*,...)
-3	bool	igTreeNodePtr (const void*,const char*,...)
+igMenuItem	2
+1	bool	igMenuItemBool (const char*,const char*,bool,bool)
+2	bool	igMenuItemBoolPtr (const char*,const char*,bool*,bool)
 igTreeNodeV	2
 1	bool	igTreeNodeVStr (const char*,const char*,va_list)
 2	bool	igTreeNodeVPtr (const void*,const char*,va_list)

generator/output/structs_and_enums.json

@@ -1,6 +1,11 @@
 {
   "enums": {
     "ImDrawCornerFlags_": [
+      {
+        "calc_value": 0,
+        "name": "ImDrawCornerFlags_None",
+        "value": "0"
+      },
       {
         "calc_value": 1,
         "name": "ImDrawCornerFlags_TopLeft",
@@ -62,6 +67,11 @@
         "calc_value": 2,
         "name": "ImDrawListFlags_AntiAliasedFill",
         "value": "1 << 1"
+      },
+      {
+        "calc_value": 4,
+        "name": "ImDrawListFlags_AllowVtxOffset",
+        "value": "1 << 2"
       }
     ],
     "ImFontAtlasFlags_": [
@@ -101,6 +111,11 @@
         "calc_value": 4,
         "name": "ImGuiBackendFlags_HasSetMousePos",
         "value": "1 << 2"
+      },
+      {
+        "calc_value": 8,
+        "name": "ImGuiBackendFlags_RendererHasVtxOffset",
+        "value": "1 << 3"
       }
     ],
     "ImGuiCol_": [
@@ -423,17 +438,17 @@
       },
       {
         "calc_value": 1048576,
-        "name": "ImGuiColorEditFlags_RGB",
+        "name": "ImGuiColorEditFlags_DisplayRGB",
         "value": "1 << 20"
       },
       {
         "calc_value": 2097152,
-        "name": "ImGuiColorEditFlags_HSV",
+        "name": "ImGuiColorEditFlags_DisplayHSV",
         "value": "1 << 21"
       },
       {
         "calc_value": 4194304,
-        "name": "ImGuiColorEditFlags_HEX",
+        "name": "ImGuiColorEditFlags_DisplayHex",
         "value": "1 << 22"
       },
       {
@@ -456,10 +471,25 @@
         "name": "ImGuiColorEditFlags_PickerHueWheel",
         "value": "1 << 26"
       },
+      {
+        "calc_value": 134217728,
+        "name": "ImGuiColorEditFlags_InputRGB",
+        "value": "1 << 27"
+      },
+      {
+        "calc_value": 268435456,
+        "name": "ImGuiColorEditFlags_InputHSV",
+        "value": "1 << 28"
+      },
+      {
+        "calc_value": 177209344,
+        "name": "ImGuiColorEditFlags__OptionsDefault",
+        "value": "ImGuiColorEditFlags_Uint8|ImGuiColorEditFlags_DisplayRGB|ImGuiColorEditFlags_InputRGB|ImGuiColorEditFlags_PickerHueBar"
+      },
       {
         "calc_value": 7340032,
-        "name": "ImGuiColorEditFlags__InputsMask",
-        "value": "ImGuiColorEditFlags_RGB|ImGuiColorEditFlags_HSV|ImGuiColorEditFlags_HEX"
+        "name": "ImGuiColorEditFlags__DisplayMask",
+        "value": "ImGuiColorEditFlags_DisplayRGB|ImGuiColorEditFlags_DisplayHSV|ImGuiColorEditFlags_DisplayHex"
       },
       {
         "calc_value": 25165824,
@@ -472,9 +502,9 @@
         "value": "ImGuiColorEditFlags_PickerHueWheel|ImGuiColorEditFlags_PickerHueBar"
       },
       {
-        "calc_value": 42991616,
-        "name": "ImGuiColorEditFlags__OptionsDefault",
-        "value": "ImGuiColorEditFlags_Uint8|ImGuiColorEditFlags_RGB|ImGuiColorEditFlags_PickerHueBar"
+        "calc_value": 402653184,
+        "name": "ImGuiColorEditFlags__InputMask",
+        "value": "ImGuiColorEditFlags_InputRGB|ImGuiColorEditFlags_InputHSV"
       }
     ],
     "ImGuiComboFlags_": [
@@ -596,38 +626,58 @@
     "ImGuiDataType_": [
       {
         "calc_value": 0,
-        "name": "ImGuiDataType_S32",
+        "name": "ImGuiDataType_S8",
         "value": 0
       },
       {
         "calc_value": 1,
-        "name": "ImGuiDataType_U32",
+        "name": "ImGuiDataType_U8",
         "value": 1
       },
       {
         "calc_value": 2,
-        "name": "ImGuiDataType_S64",
+        "name": "ImGuiDataType_S16",
         "value": 2
       },
       {
         "calc_value": 3,
-        "name": "ImGuiDataType_U64",
+        "name": "ImGuiDataType_U16",
         "value": 3
       },
       {
         "calc_value": 4,
-        "name": "ImGuiDataType_Float",
+        "name": "ImGuiDataType_S32",
         "value": 4
       },
       {
         "calc_value": 5,
-        "name": "ImGuiDataType_Double",
+        "name": "ImGuiDataType_U32",
         "value": 5
       },
       {
         "calc_value": 6,
-        "name": "ImGuiDataType_COUNT",
+        "name": "ImGuiDataType_S64",
         "value": 6
+      },
+      {
+        "calc_value": 7,
+        "name": "ImGuiDataType_U64",
+        "value": 7
+      },
+      {
+        "calc_value": 8,
+        "name": "ImGuiDataType_Float",
+        "value": 8
+      },
+      {
+        "calc_value": 9,
+        "name": "ImGuiDataType_Double",
+        "value": 9
+      },
+      {
+        "calc_value": 10,
+        "name": "ImGuiDataType_COUNT",
+        "value": 10
       }
     ],
     "ImGuiDir_": [
@@ -903,6 +953,11 @@
         "calc_value": 1048576,
         "name": "ImGuiInputTextFlags_Multiline",
         "value": "1 << 20"
+      },
+      {
+        "calc_value": 2097152,
+        "name": "ImGuiInputTextFlags_NoMarkEdited",
+        "value": "1 << 21"
       }
     ],
     "ImGuiKey_": [
@@ -983,38 +1038,43 @@
       },
       {
         "calc_value": 15,
-        "name": "ImGuiKey_A",
+        "name": "ImGuiKey_KeyPadEnter",
         "value": 15
       },
       {
         "calc_value": 16,
-        "name": "ImGuiKey_C",
+        "name": "ImGuiKey_A",
         "value": 16
       },
       {
         "calc_value": 17,
-        "name": "ImGuiKey_V",
+        "name": "ImGuiKey_C",
         "value": 17
       },
       {
         "calc_value": 18,
-        "name": "ImGuiKey_X",
+        "name": "ImGuiKey_V",
         "value": 18
       },
       {
         "calc_value": 19,
-        "name": "ImGuiKey_Y",
+        "name": "ImGuiKey_X",
         "value": 19
       },
       {
         "calc_value": 20,
-        "name": "ImGuiKey_Z",
+        "name": "ImGuiKey_Y",
         "value": 20
       },
       {
         "calc_value": 21,
-        "name": "ImGuiKey_COUNT",
+        "name": "ImGuiKey_Z",
         "value": 21
+      },
+      {
+        "calc_value": 22,
+        "name": "ImGuiKey_COUNT",
+        "value": 22
       }
     ],
     "ImGuiMouseCursor_": [
@@ -1157,29 +1217,34 @@
       },
       {
         "calc_value": 17,
-        "name": "ImGuiNavInput_KeyLeft_",
+        "name": "ImGuiNavInput_KeyTab_",
         "value": 17
       },
       {
         "calc_value": 18,
-        "name": "ImGuiNavInput_KeyRight_",
+        "name": "ImGuiNavInput_KeyLeft_",
         "value": 18
       },
       {
         "calc_value": 19,
-        "name": "ImGuiNavInput_KeyUp_",
+        "name": "ImGuiNavInput_KeyRight_",
         "value": 19
       },
       {
         "calc_value": 20,
-        "name": "ImGuiNavInput_KeyDown_",
+        "name": "ImGuiNavInput_KeyUp_",
         "value": 20
       },
       {
         "calc_value": 21,
-        "name": "ImGuiNavInput_COUNT",
+        "name": "ImGuiNavInput_KeyDown_",
         "value": 21
       },
+      {
+        "calc_value": 22,
+        "name": "ImGuiNavInput_COUNT",
+        "value": 22
+      },
       {
         "calc_value": 16,
         "name": "ImGuiNavInput_InternalStart_",
@@ -1645,40 +1710,6 @@
     ]
   },
   "structs": {
-    "CustomRect": [
-      {
-        "name": "ID",
-        "type": "unsigned int"
-      },
-      {
-        "name": "Width",
-        "type": "unsigned short"
-      },
-      {
-        "name": "Height",
-        "type": "unsigned short"
-      },
-      {
-        "name": "X",
-        "type": "unsigned short"
-      },
-      {
-        "name": "Y",
-        "type": "unsigned short"
-      },
-      {
-        "name": "GlyphAdvanceX",
-        "type": "float"
-      },
-      {
-        "name": "GlyphOffset",
-        "type": "ImVec2"
-      },
-      {
-        "name": "Font",
-        "type": "ImFont*"
-      }
-    ],
     "ImColor": [
       {
         "name": "Value",
@@ -1687,12 +1718,12 @@
     ],
     "ImDrawChannel": [
       {
-        "name": "CmdBuffer",
+        "name": "_CmdBuffer",
         "template_type": "ImDrawCmd",
         "type": "ImVector_ImDrawCmd"
       },
       {
-        "name": "IdxBuffer",
+        "name": "_IdxBuffer",
         "template_type": "ImDrawIdx",
         "type": "ImVector_ImDrawIdx"
       }
@@ -1710,6 +1741,14 @@
         "name": "TextureId",
         "type": "ImTextureID"
       },
+      {
+        "name": "VtxOffset",
+        "type": "unsigned int"
+      },
+      {
+        "name": "IdxOffset",
+        "type": "unsigned int"
+      },
       {
         "name": "UserCallback",
         "type": "ImDrawCallback"
@@ -1781,6 +1820,10 @@
         "name": "_OwnerName",
         "type": "const char*"
       },
+      {
+        "name": "_VtxCurrentOffset",
+        "type": "unsigned int"
+      },
       {
         "name": "_VtxCurrentIdx",
         "type": "unsigned int"
@@ -1809,11 +1852,17 @@
         "type": "ImVector_ImVec2"
       },
       {
-        "name": "_ChannelsCurrent",
+        "name": "_Splitter",
+        "type": "ImDrawListSplitter"
+      }
+    ],
+    "ImDrawListSplitter": [
+      {
+        "name": "_Current",
         "type": "int"
       },
       {
-        "name": "_ChannelsCount",
+        "name": "_Count",
         "type": "int"
       },
       {
@@ -1957,8 +2006,8 @@
       },
       {
         "name": "CustomRects",
-        "template_type": "CustomRect",
-        "type": "ImVector_CustomRect"
+        "template_type": "ImFontAtlasCustomRect",
+        "type": "ImVector_ImFontAtlasCustomRect"
       },
       {
         "name": "ConfigData",
@@ -1971,6 +2020,40 @@
         "type": "int"
       }
     ],
+    "ImFontAtlasCustomRect": [
+      {
+        "name": "ID",
+        "type": "unsigned int"
+      },
+      {
+        "name": "Width",
+        "type": "unsigned short"
+      },
+      {
+        "name": "Height",
+        "type": "unsigned short"
+      },
+      {
+        "name": "X",
+        "type": "unsigned short"
+      },
+      {
+        "name": "Y",
+        "type": "unsigned short"
+      },
+      {
+        "name": "GlyphAdvanceX",
+        "type": "float"
+      },
+      {
+        "name": "GlyphOffset",
+        "type": "ImVec2"
+      },
+      {
+        "name": "Font",
+        "type": "ImFont*"
+      }
+    ],
     "ImFontConfig": [
       {
         "name": "FontData",
@@ -2091,8 +2174,8 @@
     "ImFontGlyphRangesBuilder": [
       {
         "name": "UsedChars",
-        "template_type": "int",
-        "type": "ImVector_int"
+        "template_type": "ImU32",
+        "type": "ImVector_ImU32"
       }
     ],
     "ImGuiIO": [
@@ -2138,7 +2221,7 @@
       },
       {
         "name": "KeyMap[ImGuiKey_COUNT]",
-        "size": 21,
+        "size": 22,
         "type": "int"
       },
       {
@@ -2277,7 +2360,7 @@
       },
       {
         "name": "NavInputs[ImGuiNavInput_COUNT]",
-        "size": 21,
+        "size": 22,
         "type": "float"
       },
       {
@@ -2370,6 +2453,11 @@
         "size": 5,
         "type": "bool"
       },
+      {
+        "name": "MouseDownWasDoubleClick[5]",
+        "size": 5,
+        "type": "bool"
+      },
       {
         "name": "MouseDownDuration[5]",
         "size": 5,
@@ -2402,12 +2490,12 @@
       },
       {
         "name": "NavInputsDownDuration[ImGuiNavInput_COUNT]",
-        "size": 21,
+        "size": 22,
         "type": "float"
       },
       {
         "name": "NavInputsDownDurationPrev[ImGuiNavInput_COUNT]",
-        "size": 21,
+        "size": 22,
         "type": "float"
       },
       {
@@ -2554,8 +2642,18 @@
     "ImGuiStorage": [
       {
         "name": "Data",
-        "template_type": "Pair",
-        "type": "ImVector_Pair"
+        "template_type": "ImGuiStoragePair",
+        "type": "ImVector_ImGuiStoragePair"
+      }
+    ],
+    "ImGuiStoragePair": [
+      {
+        "name": "key",
+        "type": "ImGuiID"
+      },
+      {
+        "name": "",
+        "type": "union { int val_i; float val_f; void* val_p;}"
       }
     ],
     "ImGuiStyle": [
@@ -2583,6 +2681,10 @@
         "name": "WindowTitleAlign",
         "type": "ImVec2"
       },
+      {
+        "name": "WindowMenuButtonPosition",
+        "type": "ImGuiDir"
+      },
       {
         "name": "ChildRounding",
         "type": "float"
@@ -2655,6 +2757,10 @@
         "name": "TabBorderSize",
         "type": "float"
       },
+      {
+        "name": "ColorButtonPosition",
+        "type": "ImGuiDir"
+      },
       {
         "name": "ButtonTextAlign",
         "type": "ImVec2"
@@ -2708,14 +2814,24 @@
       },
       {
         "name": "Filters",
-        "template_type": "TextRange",
-        "type": "ImVector_TextRange"
+        "template_type": "ImGuiTextRange",
+        "type": "ImVector_ImGuiTextRange"
       },
       {
         "name": "CountGrep",
         "type": "int"
       }
     ],
+    "ImGuiTextRange": [
+      {
+        "name": "b",
+        "type": "const char*"
+      },
+      {
+        "name": "e",
+        "type": "const char*"
+      }
+    ],
     "ImVec2": [
       {
         "name": "x",
@@ -2743,26 +2859,6 @@
         "name": "w",
         "type": "float"
       }
-    ],
-    "Pair": [
-      {
-        "name": "key",
-        "type": "ImGuiID"
-      },
-      {
-        "name": "",
-        "type": "union { int val_i; float val_f; void* val_p;}"
-      }
-    ],
-    "TextRange": [
-      {
-        "name": "b",
-        "type": "const char*"
-      },
-      {
-        "name": "e",
-        "type": "const char*"
-      }
     ]
   }
 }

generator/output/structs_and_enums.lua

@@ -2,41 +2,45 @@ local defs = {}
 defs["enums"] = {}
 defs["enums"]["ImDrawCornerFlags_"] = {}
 defs["enums"]["ImDrawCornerFlags_"][1] = {}
-defs["enums"]["ImDrawCornerFlags_"][1]["calc_value"] = 1
-defs["enums"]["ImDrawCornerFlags_"][1]["name"] = "ImDrawCornerFlags_TopLeft"
-defs["enums"]["ImDrawCornerFlags_"][1]["value"] = "1 << 0"
+defs["enums"]["ImDrawCornerFlags_"][1]["calc_value"] = 0
+defs["enums"]["ImDrawCornerFlags_"][1]["name"] = "ImDrawCornerFlags_None"
+defs["enums"]["ImDrawCornerFlags_"][1]["value"] = "0"
 defs["enums"]["ImDrawCornerFlags_"][2] = {}
-defs["enums"]["ImDrawCornerFlags_"][2]["calc_value"] = 2
-defs["enums"]["ImDrawCornerFlags_"][2]["name"] = "ImDrawCornerFlags_TopRight"
-defs["enums"]["ImDrawCornerFlags_"][2]["value"] = "1 << 1"
+defs["enums"]["ImDrawCornerFlags_"][2]["calc_value"] = 1
+defs["enums"]["ImDrawCornerFlags_"][2]["name"] = "ImDrawCornerFlags_TopLeft"
+defs["enums"]["ImDrawCornerFlags_"][2]["value"] = "1 << 0"
 defs["enums"]["ImDrawCornerFlags_"][3] = {}
-defs["enums"]["ImDrawCornerFlags_"][3]["calc_value"] = 4
-defs["enums"]["ImDrawCornerFlags_"][3]["name"] = "ImDrawCornerFlags_BotLeft"
-defs["enums"]["ImDrawCornerFlags_"][3]["value"] = "1 << 2"
+defs["enums"]["ImDrawCornerFlags_"][3]["calc_value"] = 2
+defs["enums"]["ImDrawCornerFlags_"][3]["name"] = "ImDrawCornerFlags_TopRight"
+defs["enums"]["ImDrawCornerFlags_"][3]["value"] = "1 << 1"
 defs["enums"]["ImDrawCornerFlags_"][4] = {}
-defs["enums"]["ImDrawCornerFlags_"][4]["calc_value"] = 8
-defs["enums"]["ImDrawCornerFlags_"][4]["name"] = "ImDrawCornerFlags_BotRight"
-defs["enums"]["ImDrawCornerFlags_"][4]["value"] = "1 << 3"
+defs["enums"]["ImDrawCornerFlags_"][4]["calc_value"] = 4
+defs["enums"]["ImDrawCornerFlags_"][4]["name"] = "ImDrawCornerFlags_BotLeft"
+defs["enums"]["ImDrawCornerFlags_"][4]["value"] = "1 << 2"
 defs["enums"]["ImDrawCornerFlags_"][5] = {}
-defs["enums"]["ImDrawCornerFlags_"][5]["calc_value"] = 3
-defs["enums"]["ImDrawCornerFlags_"][5]["name"] = "ImDrawCornerFlags_Top"
-defs["enums"]["ImDrawCornerFlags_"][5]["value"] = "ImDrawCornerFlags_TopLeft | ImDrawCornerFlags_TopRight"
+defs["enums"]["ImDrawCornerFlags_"][5]["calc_value"] = 8
+defs["enums"]["ImDrawCornerFlags_"][5]["name"] = "ImDrawCornerFlags_BotRight"
+defs["enums"]["ImDrawCornerFlags_"][5]["value"] = "1 << 3"
 defs["enums"]["ImDrawCornerFlags_"][6] = {}
-defs["enums"]["ImDrawCornerFlags_"][6]["calc_value"] = 12
-defs["enums"]["ImDrawCornerFlags_"][6]["name"] = "ImDrawCornerFlags_Bot"
-defs["enums"]["ImDrawCornerFlags_"][6]["value"] = "ImDrawCornerFlags_BotLeft | ImDrawCornerFlags_BotRight"
+defs["enums"]["ImDrawCornerFlags_"][6]["calc_value"] = 3
+defs["enums"]["ImDrawCornerFlags_"][6]["name"] = "ImDrawCornerFlags_Top"
+defs["enums"]["ImDrawCornerFlags_"][6]["value"] = "ImDrawCornerFlags_TopLeft | ImDrawCornerFlags_TopRight"
 defs["enums"]["ImDrawCornerFlags_"][7] = {}
-defs["enums"]["ImDrawCornerFlags_"][7]["calc_value"] = 5
-defs["enums"]["ImDrawCornerFlags_"][7]["name"] = "ImDrawCornerFlags_Left"
-defs["enums"]["ImDrawCornerFlags_"][7]["value"] = "ImDrawCornerFlags_TopLeft | ImDrawCornerFlags_BotLeft"
+defs["enums"]["ImDrawCornerFlags_"][7]["calc_value"] = 12
+defs["enums"]["ImDrawCornerFlags_"][7]["name"] = "ImDrawCornerFlags_Bot"
+defs["enums"]["ImDrawCornerFlags_"][7]["value"] = "ImDrawCornerFlags_BotLeft | ImDrawCornerFlags_BotRight"
 defs["enums"]["ImDrawCornerFlags_"][8] = {}
-defs["enums"]["ImDrawCornerFlags_"][8]["calc_value"] = 10
-defs["enums"]["ImDrawCornerFlags_"][8]["name"] = "ImDrawCornerFlags_Right"
-defs["enums"]["ImDrawCornerFlags_"][8]["value"] = "ImDrawCornerFlags_TopRight | ImDrawCornerFlags_BotRight"
+defs["enums"]["ImDrawCornerFlags_"][8]["calc_value"] = 5
+defs["enums"]["ImDrawCornerFlags_"][8]["name"] = "ImDrawCornerFlags_Left"
+defs["enums"]["ImDrawCornerFlags_"][8]["value"] = "ImDrawCornerFlags_TopLeft | ImDrawCornerFlags_BotLeft"
 defs["enums"]["ImDrawCornerFlags_"][9] = {}
-defs["enums"]["ImDrawCornerFlags_"][9]["calc_value"] = 15
-defs["enums"]["ImDrawCornerFlags_"][9]["name"] = "ImDrawCornerFlags_All"
-defs["enums"]["ImDrawCornerFlags_"][9]["value"] = "0xF"
+defs["enums"]["ImDrawCornerFlags_"][9]["calc_value"] = 10
+defs["enums"]["ImDrawCornerFlags_"][9]["name"] = "ImDrawCornerFlags_Right"
+defs["enums"]["ImDrawCornerFlags_"][9]["value"] = "ImDrawCornerFlags_TopRight | ImDrawCornerFlags_BotRight"
+defs["enums"]["ImDrawCornerFlags_"][10] = {}
+defs["enums"]["ImDrawCornerFlags_"][10]["calc_value"] = 15
+defs["enums"]["ImDrawCornerFlags_"][10]["name"] = "ImDrawCornerFlags_All"
+defs["enums"]["ImDrawCornerFlags_"][10]["value"] = "0xF"
 defs["enums"]["ImDrawListFlags_"] = {}
 defs["enums"]["ImDrawListFlags_"][1] = {}
 defs["enums"]["ImDrawListFlags_"][1]["calc_value"] = 0
@@ -50,6 +54,10 @@ defs["enums"]["ImDrawListFlags_"][3] = {}
 defs["enums"]["ImDrawListFlags_"][3]["calc_value"] = 2
 defs["enums"]["ImDrawListFlags_"][3]["name"] = "ImDrawListFlags_AntiAliasedFill"
 defs["enums"]["ImDrawListFlags_"][3]["value"] = "1 << 1"
+defs["enums"]["ImDrawListFlags_"][4] = {}
+defs["enums"]["ImDrawListFlags_"][4]["calc_value"] = 4
+defs["enums"]["ImDrawListFlags_"][4]["name"] = "ImDrawListFlags_AllowVtxOffset"
+defs["enums"]["ImDrawListFlags_"][4]["value"] = "1 << 2"
 defs["enums"]["ImFontAtlasFlags_"] = {}
 defs["enums"]["ImFontAtlasFlags_"][1] = {}
 defs["enums"]["ImFontAtlasFlags_"][1]["calc_value"] = 0
@@ -80,6 +88,10 @@ defs["enums"]["ImGuiBackendFlags_"][4] = {}
 defs["enums"]["ImGuiBackendFlags_"][4]["calc_value"] = 4
 defs["enums"]["ImGuiBackendFlags_"][4]["name"] = "ImGuiBackendFlags_HasSetMousePos"
 defs["enums"]["ImGuiBackendFlags_"][4]["value"] = "1 << 2"
+defs["enums"]["ImGuiBackendFlags_"][5] = {}
+defs["enums"]["ImGuiBackendFlags_"][5]["calc_value"] = 8
+defs["enums"]["ImGuiBackendFlags_"][5]["name"] = "ImGuiBackendFlags_RendererHasVtxOffset"
+defs["enums"]["ImGuiBackendFlags_"][5]["value"] = "1 << 3"
 defs["enums"]["ImGuiCol_"] = {}
 defs["enums"]["ImGuiCol_"][1] = {}
 defs["enums"]["ImGuiCol_"][1]["calc_value"] = 0
@@ -336,15 +348,15 @@ defs["enums"]["ImGuiColorEditFlags_"][14]["name"] = "ImGuiColorEditFlags_HDR"
 defs["enums"]["ImGuiColorEditFlags_"][14]["value"] = "1 << 19"
 defs["enums"]["ImGuiColorEditFlags_"][15] = {}
 defs["enums"]["ImGuiColorEditFlags_"][15]["calc_value"] = 1048576
-defs["enums"]["ImGuiColorEditFlags_"][15]["name"] = "ImGuiColorEditFlags_RGB"
+defs["enums"]["ImGuiColorEditFlags_"][15]["name"] = "ImGuiColorEditFlags_DisplayRGB"
 defs["enums"]["ImGuiColorEditFlags_"][15]["value"] = "1 << 20"
 defs["enums"]["ImGuiColorEditFlags_"][16] = {}
 defs["enums"]["ImGuiColorEditFlags_"][16]["calc_value"] = 2097152
-defs["enums"]["ImGuiColorEditFlags_"][16]["name"] = "ImGuiColorEditFlags_HSV"
+defs["enums"]["ImGuiColorEditFlags_"][16]["name"] = "ImGuiColorEditFlags_DisplayHSV"
 defs["enums"]["ImGuiColorEditFlags_"][16]["value"] = "1 << 21"
 defs["enums"]["ImGuiColorEditFlags_"][17] = {}
 defs["enums"]["ImGuiColorEditFlags_"][17]["calc_value"] = 4194304
-defs["enums"]["ImGuiColorEditFlags_"][17]["name"] = "ImGuiColorEditFlags_HEX"
+defs["enums"]["ImGuiColorEditFlags_"][17]["name"] = "ImGuiColorEditFlags_DisplayHex"
 defs["enums"]["ImGuiColorEditFlags_"][17]["value"] = "1 << 22"
 defs["enums"]["ImGuiColorEditFlags_"][18] = {}
 defs["enums"]["ImGuiColorEditFlags_"][18]["calc_value"] = 8388608
@@ -363,21 +375,33 @@ defs["enums"]["ImGuiColorEditFlags_"][21]["calc_value"] = 67108864
 defs["enums"]["ImGuiColorEditFlags_"][21]["name"] = "ImGuiColorEditFlags_PickerHueWheel"
 defs["enums"]["ImGuiColorEditFlags_"][21]["value"] = "1 << 26"
 defs["enums"]["ImGuiColorEditFlags_"][22] = {}
-defs["enums"]["ImGuiColorEditFlags_"][22]["calc_value"] = 7340032
-defs["enums"]["ImGuiColorEditFlags_"][22]["name"] = "ImGuiColorEditFlags__InputsMask"
-defs["enums"]["ImGuiColorEditFlags_"][22]["value"] = "ImGuiColorEditFlags_RGB|ImGuiColorEditFlags_HSV|ImGuiColorEditFlags_HEX"
+defs["enums"]["ImGuiColorEditFlags_"][22]["calc_value"] = 134217728
+defs["enums"]["ImGuiColorEditFlags_"][22]["name"] = "ImGuiColorEditFlags_InputRGB"
+defs["enums"]["ImGuiColorEditFlags_"][22]["value"] = "1 << 27"
 defs["enums"]["ImGuiColorEditFlags_"][23] = {}
-defs["enums"]["ImGuiColorEditFlags_"][23]["calc_value"] = 25165824
-defs["enums"]["ImGuiColorEditFlags_"][23]["name"] = "ImGuiColorEditFlags__DataTypeMask"
-defs["enums"]["ImGuiColorEditFlags_"][23]["value"] = "ImGuiColorEditFlags_Uint8|ImGuiColorEditFlags_Float"
+defs["enums"]["ImGuiColorEditFlags_"][23]["calc_value"] = 268435456
+defs["enums"]["ImGuiColorEditFlags_"][23]["name"] = "ImGuiColorEditFlags_InputHSV"
+defs["enums"]["ImGuiColorEditFlags_"][23]["value"] = "1 << 28"
 defs["enums"]["ImGuiColorEditFlags_"][24] = {}
-defs["enums"]["ImGuiColorEditFlags_"][24]["calc_value"] = 100663296
-defs["enums"]["ImGuiColorEditFlags_"][24]["name"] = "ImGuiColorEditFlags__PickerMask"
-defs["enums"]["ImGuiColorEditFlags_"][24]["value"] = "ImGuiColorEditFlags_PickerHueWheel|ImGuiColorEditFlags_PickerHueBar"
+defs["enums"]["ImGuiColorEditFlags_"][24]["calc_value"] = 177209344
+defs["enums"]["ImGuiColorEditFlags_"][24]["name"] = "ImGuiColorEditFlags__OptionsDefault"
+defs["enums"]["ImGuiColorEditFlags_"][24]["value"] = "ImGuiColorEditFlags_Uint8|ImGuiColorEditFlags_DisplayRGB|ImGuiColorEditFlags_InputRGB|ImGuiColorEditFlags_PickerHueBar"
 defs["enums"]["ImGuiColorEditFlags_"][25] = {}
-defs["enums"]["ImGuiColorEditFlags_"][25]["calc_value"] = 42991616
-defs["enums"]["ImGuiColorEditFlags_"][25]["name"] = "ImGuiColorEditFlags__OptionsDefault"
-defs["enums"]["ImGuiColorEditFlags_"][25]["value"] = "ImGuiColorEditFlags_Uint8|ImGuiColorEditFlags_RGB|ImGuiColorEditFlags_PickerHueBar"
+defs["enums"]["ImGuiColorEditFlags_"][25]["calc_value"] = 7340032
+defs["enums"]["ImGuiColorEditFlags_"][25]["name"] = "ImGuiColorEditFlags__DisplayMask"
+defs["enums"]["ImGuiColorEditFlags_"][25]["value"] = "ImGuiColorEditFlags_DisplayRGB|ImGuiColorEditFlags_DisplayHSV|ImGuiColorEditFlags_DisplayHex"
+defs["enums"]["ImGuiColorEditFlags_"][26] = {}
+defs["enums"]["ImGuiColorEditFlags_"][26]["calc_value"] = 25165824
+defs["enums"]["ImGuiColorEditFlags_"][26]["name"] = "ImGuiColorEditFlags__DataTypeMask"
+defs["enums"]["ImGuiColorEditFlags_"][26]["value"] = "ImGuiColorEditFlags_Uint8|ImGuiColorEditFlags_Float"
+defs["enums"]["ImGuiColorEditFlags_"][27] = {}
+defs["enums"]["ImGuiColorEditFlags_"][27]["calc_value"] = 100663296
+defs["enums"]["ImGuiColorEditFlags_"][27]["name"] = "ImGuiColorEditFlags__PickerMask"
+defs["enums"]["ImGuiColorEditFlags_"][27]["value"] = "ImGuiColorEditFlags_PickerHueWheel|ImGuiColorEditFlags_PickerHueBar"
+defs["enums"]["ImGuiColorEditFlags_"][28] = {}
+defs["enums"]["ImGuiColorEditFlags_"][28]["calc_value"] = 402653184
+defs["enums"]["ImGuiColorEditFlags_"][28]["name"] = "ImGuiColorEditFlags__InputMask"
+defs["enums"]["ImGuiColorEditFlags_"][28]["value"] = "ImGuiColorEditFlags_InputRGB|ImGuiColorEditFlags_InputHSV"
 defs["enums"]["ImGuiComboFlags_"] = {}
 defs["enums"]["ImGuiComboFlags_"][1] = {}
 defs["enums"]["ImGuiComboFlags_"][1]["calc_value"] = 0
@@ -472,32 +496,48 @@ defs["enums"]["ImGuiConfigFlags_"][9]["value"] = "1 << 21"
 defs["enums"]["ImGuiDataType_"] = {}
 defs["enums"]["ImGuiDataType_"][1] = {}
 defs["enums"]["ImGuiDataType_"][1]["calc_value"] = 0
-defs["enums"]["ImGuiDataType_"][1]["name"] = "ImGuiDataType_S32"
+defs["enums"]["ImGuiDataType_"][1]["name"] = "ImGuiDataType_S8"
 defs["enums"]["ImGuiDataType_"][1]["value"] = 0
 defs["enums"]["ImGuiDataType_"][2] = {}
 defs["enums"]["ImGuiDataType_"][2]["calc_value"] = 1
-defs["enums"]["ImGuiDataType_"][2]["name"] = "ImGuiDataType_U32"
+defs["enums"]["ImGuiDataType_"][2]["name"] = "ImGuiDataType_U8"
 defs["enums"]["ImGuiDataType_"][2]["value"] = 1
 defs["enums"]["ImGuiDataType_"][3] = {}
 defs["enums"]["ImGuiDataType_"][3]["calc_value"] = 2
-defs["enums"]["ImGuiDataType_"][3]["name"] = "ImGuiDataType_S64"
+defs["enums"]["ImGuiDataType_"][3]["name"] = "ImGuiDataType_S16"
 defs["enums"]["ImGuiDataType_"][3]["value"] = 2
 defs["enums"]["ImGuiDataType_"][4] = {}
 defs["enums"]["ImGuiDataType_"][4]["calc_value"] = 3
-defs["enums"]["ImGuiDataType_"][4]["name"] = "ImGuiDataType_U64"
+defs["enums"]["ImGuiDataType_"][4]["name"] = "ImGuiDataType_U16"
 defs["enums"]["ImGuiDataType_"][4]["value"] = 3
 defs["enums"]["ImGuiDataType_"][5] = {}
 defs["enums"]["ImGuiDataType_"][5]["calc_value"] = 4
-defs["enums"]["ImGuiDataType_"][5]["name"] = "ImGuiDataType_Float"
+defs["enums"]["ImGuiDataType_"][5]["name"] = "ImGuiDataType_S32"
 defs["enums"]["ImGuiDataType_"][5]["value"] = 4
 defs["enums"]["ImGuiDataType_"][6] = {}
 defs["enums"]["ImGuiDataType_"][6]["calc_value"] = 5
-defs["enums"]["ImGuiDataType_"][6]["name"] = "ImGuiDataType_Double"
+defs["enums"]["ImGuiDataType_"][6]["name"] = "ImGuiDataType_U32"
 defs["enums"]["ImGuiDataType_"][6]["value"] = 5
 defs["enums"]["ImGuiDataType_"][7] = {}
 defs["enums"]["ImGuiDataType_"][7]["calc_value"] = 6
-defs["enums"]["ImGuiDataType_"][7]["name"] = "ImGuiDataType_COUNT"
+defs["enums"]["ImGuiDataType_"][7]["name"] = "ImGuiDataType_S64"
 defs["enums"]["ImGuiDataType_"][7]["value"] = 6
+defs["enums"]["ImGuiDataType_"][8] = {}
+defs["enums"]["ImGuiDataType_"][8]["calc_value"] = 7
+defs["enums"]["ImGuiDataType_"][8]["name"] = "ImGuiDataType_U64"
+defs["enums"]["ImGuiDataType_"][8]["value"] = 7
+defs["enums"]["ImGuiDataType_"][9] = {}
+defs["enums"]["ImGuiDataType_"][9]["calc_value"] = 8
+defs["enums"]["ImGuiDataType_"][9]["name"] = "ImGuiDataType_Float"
+defs["enums"]["ImGuiDataType_"][9]["value"] = 8
+defs["enums"]["ImGuiDataType_"][10] = {}
+defs["enums"]["ImGuiDataType_"][10]["calc_value"] = 9
+defs["enums"]["ImGuiDataType_"][10]["name"] = "ImGuiDataType_Double"
+defs["enums"]["ImGuiDataType_"][10]["value"] = 9
+defs["enums"]["ImGuiDataType_"][11] = {}
+defs["enums"]["ImGuiDataType_"][11]["calc_value"] = 10
+defs["enums"]["ImGuiDataType_"][11]["name"] = "ImGuiDataType_COUNT"
+defs["enums"]["ImGuiDataType_"][11]["value"] = 10
 defs["enums"]["ImGuiDir_"] = {}
 defs["enums"]["ImGuiDir_"][1] = {}
 defs["enums"]["ImGuiDir_"][1]["calc_value"] = -1
@@ -715,6 +755,10 @@ defs["enums"]["ImGuiInputTextFlags_"][21] = {}
 defs["enums"]["ImGuiInputTextFlags_"][21]["calc_value"] = 1048576
 defs["enums"]["ImGuiInputTextFlags_"][21]["name"] = "ImGuiInputTextFlags_Multiline"
 defs["enums"]["ImGuiInputTextFlags_"][21]["value"] = "1 << 20"
+defs["enums"]["ImGuiInputTextFlags_"][22] = {}
+defs["enums"]["ImGuiInputTextFlags_"][22]["calc_value"] = 2097152
+defs["enums"]["ImGuiInputTextFlags_"][22]["name"] = "ImGuiInputTextFlags_NoMarkEdited"
+defs["enums"]["ImGuiInputTextFlags_"][22]["value"] = "1 << 21"
 defs["enums"]["ImGuiKey_"] = {}
 defs["enums"]["ImGuiKey_"][1] = {}
 defs["enums"]["ImGuiKey_"][1]["calc_value"] = 0
@@ -778,32 +822,36 @@ defs["enums"]["ImGuiKey_"][15]["name"] = "ImGuiKey_Escape"
 defs["enums"]["ImGuiKey_"][15]["value"] = 14
 defs["enums"]["ImGuiKey_"][16] = {}
 defs["enums"]["ImGuiKey_"][16]["calc_value"] = 15
-defs["enums"]["ImGuiKey_"][16]["name"] = "ImGuiKey_A"
+defs["enums"]["ImGuiKey_"][16]["name"] = "ImGuiKey_KeyPadEnter"
 defs["enums"]["ImGuiKey_"][16]["value"] = 15
 defs["enums"]["ImGuiKey_"][17] = {}
 defs["enums"]["ImGuiKey_"][17]["calc_value"] = 16
-defs["enums"]["ImGuiKey_"][17]["name"] = "ImGuiKey_C"
+defs["enums"]["ImGuiKey_"][17]["name"] = "ImGuiKey_A"
 defs["enums"]["ImGuiKey_"][17]["value"] = 16
 defs["enums"]["ImGuiKey_"][18] = {}
 defs["enums"]["ImGuiKey_"][18]["calc_value"] = 17
-defs["enums"]["ImGuiKey_"][18]["name"] = "ImGuiKey_V"
+defs["enums"]["ImGuiKey_"][18]["name"] = "ImGuiKey_C"
 defs["enums"]["ImGuiKey_"][18]["value"] = 17
 defs["enums"]["ImGuiKey_"][19] = {}
 defs["enums"]["ImGuiKey_"][19]["calc_value"] = 18
-defs["enums"]["ImGuiKey_"][19]["name"] = "ImGuiKey_X"
+defs["enums"]["ImGuiKey_"][19]["name"] = "ImGuiKey_V"
 defs["enums"]["ImGuiKey_"][19]["value"] = 18
 defs["enums"]["ImGuiKey_"][20] = {}
 defs["enums"]["ImGuiKey_"][20]["calc_value"] = 19
-defs["enums"]["ImGuiKey_"][20]["name"] = "ImGuiKey_Y"
+defs["enums"]["ImGuiKey_"][20]["name"] = "ImGuiKey_X"
 defs["enums"]["ImGuiKey_"][20]["value"] = 19
 defs["enums"]["ImGuiKey_"][21] = {}
 defs["enums"]["ImGuiKey_"][21]["calc_value"] = 20
-defs["enums"]["ImGuiKey_"][21]["name"] = "ImGuiKey_Z"
+defs["enums"]["ImGuiKey_"][21]["name"] = "ImGuiKey_Y"
 defs["enums"]["ImGuiKey_"][21]["value"] = 20
 defs["enums"]["ImGuiKey_"][22] = {}
 defs["enums"]["ImGuiKey_"][22]["calc_value"] = 21
-defs["enums"]["ImGuiKey_"][22]["name"] = "ImGuiKey_COUNT"
+defs["enums"]["ImGuiKey_"][22]["name"] = "ImGuiKey_Z"
 defs["enums"]["ImGuiKey_"][22]["value"] = 21
+defs["enums"]["ImGuiKey_"][23] = {}
+defs["enums"]["ImGuiKey_"][23]["calc_value"] = 22
+defs["enums"]["ImGuiKey_"][23]["name"] = "ImGuiKey_COUNT"
+defs["enums"]["ImGuiKey_"][23]["value"] = 22
 defs["enums"]["ImGuiMouseCursor_"] = {}
 defs["enums"]["ImGuiMouseCursor_"][1] = {}
 defs["enums"]["ImGuiMouseCursor_"][1]["calc_value"] = -1
@@ -916,28 +964,32 @@ defs["enums"]["ImGuiNavInput_"][17]["name"] = "ImGuiNavInput_KeyMenu_"
 defs["enums"]["ImGuiNavInput_"][17]["value"] = 16
 defs["enums"]["ImGuiNavInput_"][18] = {}
 defs["enums"]["ImGuiNavInput_"][18]["calc_value"] = 17
-defs["enums"]["ImGuiNavInput_"][18]["name"] = "ImGuiNavInput_KeyLeft_"
+defs["enums"]["ImGuiNavInput_"][18]["name"] = "ImGuiNavInput_KeyTab_"
 defs["enums"]["ImGuiNavInput_"][18]["value"] = 17
 defs["enums"]["ImGuiNavInput_"][19] = {}
 defs["enums"]["ImGuiNavInput_"][19]["calc_value"] = 18
-defs["enums"]["ImGuiNavInput_"][19]["name"] = "ImGuiNavInput_KeyRight_"
+defs["enums"]["ImGuiNavInput_"][19]["name"] = "ImGuiNavInput_KeyLeft_"
 defs["enums"]["ImGuiNavInput_"][19]["value"] = 18
 defs["enums"]["ImGuiNavInput_"][20] = {}
 defs["enums"]["ImGuiNavInput_"][20]["calc_value"] = 19
-defs["enums"]["ImGuiNavInput_"][20]["name"] = "ImGuiNavInput_KeyUp_"
+defs["enums"]["ImGuiNavInput_"][20]["name"] = "ImGuiNavInput_KeyRight_"
 defs["enums"]["ImGuiNavInput_"][20]["value"] = 19
 defs["enums"]["ImGuiNavInput_"][21] = {}
 defs["enums"]["ImGuiNavInput_"][21]["calc_value"] = 20
-defs["enums"]["ImGuiNavInput_"][21]["name"] = "ImGuiNavInput_KeyDown_"
+defs["enums"]["ImGuiNavInput_"][21]["name"] = "ImGuiNavInput_KeyUp_"
 defs["enums"]["ImGuiNavInput_"][21]["value"] = 20
 defs["enums"]["ImGuiNavInput_"][22] = {}
 defs["enums"]["ImGuiNavInput_"][22]["calc_value"] = 21
-defs["enums"]["ImGuiNavInput_"][22]["name"] = "ImGuiNavInput_COUNT"
+defs["enums"]["ImGuiNavInput_"][22]["name"] = "ImGuiNavInput_KeyDown_"
 defs["enums"]["ImGuiNavInput_"][22]["value"] = 21
 defs["enums"]["ImGuiNavInput_"][23] = {}
-defs["enums"]["ImGuiNavInput_"][23]["calc_value"] = 16
-defs["enums"]["ImGuiNavInput_"][23]["name"] = "ImGuiNavInput_InternalStart_"
-defs["enums"]["ImGuiNavInput_"][23]["value"] = "ImGuiNavInput_KeyMenu_"
+defs["enums"]["ImGuiNavInput_"][23]["calc_value"] = 22
+defs["enums"]["ImGuiNavInput_"][23]["name"] = "ImGuiNavInput_COUNT"
+defs["enums"]["ImGuiNavInput_"][23]["value"] = 22
+defs["enums"]["ImGuiNavInput_"][24] = {}
+defs["enums"]["ImGuiNavInput_"][24]["calc_value"] = 16
+defs["enums"]["ImGuiNavInput_"][24]["name"] = "ImGuiNavInput_InternalStart_"
+defs["enums"]["ImGuiNavInput_"][24]["value"] = "ImGuiNavInput_KeyMenu_"
 defs["enums"]["ImGuiSelectableFlags_"] = {}
 defs["enums"]["ImGuiSelectableFlags_"][1] = {}
 defs["enums"]["ImGuiSelectableFlags_"][1]["calc_value"] = 0
@@ -1301,42 +1353,17 @@ defs["enums"]["ImGuiWindowFlags_"][30]["calc_value"] = 268435456
 defs["enums"]["ImGuiWindowFlags_"][30]["name"] = "ImGuiWindowFlags_ChildMenu"
 defs["enums"]["ImGuiWindowFlags_"][30]["value"] = "1 << 28"
 defs["structs"] = {}
-defs["structs"]["CustomRect"] = {}
-defs["structs"]["CustomRect"][1] = {}
-defs["structs"]["CustomRect"][1]["name"] = "ID"
-defs["structs"]["CustomRect"][1]["type"] = "unsigned int"
-defs["structs"]["CustomRect"][2] = {}
-defs["structs"]["CustomRect"][2]["name"] = "Width"
-defs["structs"]["CustomRect"][2]["type"] = "unsigned short"
-defs["structs"]["CustomRect"][3] = {}
-defs["structs"]["CustomRect"][3]["name"] = "Height"
-defs["structs"]["CustomRect"][3]["type"] = "unsigned short"
-defs["structs"]["CustomRect"][4] = {}
-defs["structs"]["CustomRect"][4]["name"] = "X"
-defs["structs"]["CustomRect"][4]["type"] = "unsigned short"
-defs["structs"]["CustomRect"][5] = {}
-defs["structs"]["CustomRect"][5]["name"] = "Y"
-defs["structs"]["CustomRect"][5]["type"] = "unsigned short"
-defs["structs"]["CustomRect"][6] = {}
-defs["structs"]["CustomRect"][6]["name"] = "GlyphAdvanceX"
-defs["structs"]["CustomRect"][6]["type"] = "float"
-defs["structs"]["CustomRect"][7] = {}
-defs["structs"]["CustomRect"][7]["name"] = "GlyphOffset"
-defs["structs"]["CustomRect"][7]["type"] = "ImVec2"
-defs["structs"]["CustomRect"][8] = {}
-defs["structs"]["CustomRect"][8]["name"] = "Font"
-defs["structs"]["CustomRect"][8]["type"] = "ImFont*"
 defs["structs"]["ImColor"] = {}
 defs["structs"]["ImColor"][1] = {}
 defs["structs"]["ImColor"][1]["name"] = "Value"
 defs["structs"]["ImColor"][1]["type"] = "ImVec4"
 defs["structs"]["ImDrawChannel"] = {}
 defs["structs"]["ImDrawChannel"][1] = {}
-defs["structs"]["ImDrawChannel"][1]["name"] = "CmdBuffer"
+defs["structs"]["ImDrawChannel"][1]["name"] = "_CmdBuffer"
 defs["structs"]["ImDrawChannel"][1]["template_type"] = "ImDrawCmd"
 defs["structs"]["ImDrawChannel"][1]["type"] = "ImVector_ImDrawCmd"
 defs["structs"]["ImDrawChannel"][2] = {}
-defs["structs"]["ImDrawChannel"][2]["name"] = "IdxBuffer"
+defs["structs"]["ImDrawChannel"][2]["name"] = "_IdxBuffer"
 defs["structs"]["ImDrawChannel"][2]["template_type"] = "ImDrawIdx"
 defs["structs"]["ImDrawChannel"][2]["type"] = "ImVector_ImDrawIdx"
 defs["structs"]["ImDrawCmd"] = {}
@@ -1350,11 +1377,17 @@ defs["structs"]["ImDrawCmd"][3] = {}
 defs["structs"]["ImDrawCmd"][3]["name"] = "TextureId"
 defs["structs"]["ImDrawCmd"][3]["type"] = "ImTextureID"
 defs["structs"]["ImDrawCmd"][4] = {}
-defs["structs"]["ImDrawCmd"][4]["name"] = "UserCallback"
-defs["structs"]["ImDrawCmd"][4]["type"] = "ImDrawCallback"
+defs["structs"]["ImDrawCmd"][4]["name"] = "VtxOffset"
+defs["structs"]["ImDrawCmd"][4]["type"] = "unsigned int"
 defs["structs"]["ImDrawCmd"][5] = {}
-defs["structs"]["ImDrawCmd"][5]["name"] = "UserCallbackData"
-defs["structs"]["ImDrawCmd"][5]["type"] = "void*"
+defs["structs"]["ImDrawCmd"][5]["name"] = "IdxOffset"
+defs["structs"]["ImDrawCmd"][5]["type"] = "unsigned int"
+defs["structs"]["ImDrawCmd"][6] = {}
+defs["structs"]["ImDrawCmd"][6]["name"] = "UserCallback"
+defs["structs"]["ImDrawCmd"][6]["type"] = "ImDrawCallback"
+defs["structs"]["ImDrawCmd"][7] = {}
+defs["structs"]["ImDrawCmd"][7]["name"] = "UserCallbackData"
+defs["structs"]["ImDrawCmd"][7]["type"] = "void*"
 defs["structs"]["ImDrawData"] = {}
 defs["structs"]["ImDrawData"][1] = {}
 defs["structs"]["ImDrawData"][1]["name"] = "Valid"
@@ -1403,36 +1436,43 @@ defs["structs"]["ImDrawList"][6] = {}
 defs["structs"]["ImDrawList"][6]["name"] = "_OwnerName"
 defs["structs"]["ImDrawList"][6]["type"] = "const char*"
 defs["structs"]["ImDrawList"][7] = {}
-defs["structs"]["ImDrawList"][7]["name"] = "_VtxCurrentIdx"
+defs["structs"]["ImDrawList"][7]["name"] = "_VtxCurrentOffset"
 defs["structs"]["ImDrawList"][7]["type"] = "unsigned int"
 defs["structs"]["ImDrawList"][8] = {}
-defs["structs"]["ImDrawList"][8]["name"] = "_VtxWritePtr"
-defs["structs"]["ImDrawList"][8]["type"] = "ImDrawVert*"
+defs["structs"]["ImDrawList"][8]["name"] = "_VtxCurrentIdx"
+defs["structs"]["ImDrawList"][8]["type"] = "unsigned int"
 defs["structs"]["ImDrawList"][9] = {}
-defs["structs"]["ImDrawList"][9]["name"] = "_IdxWritePtr"
-defs["structs"]["ImDrawList"][9]["type"] = "ImDrawIdx*"
+defs["structs"]["ImDrawList"][9]["name"] = "_VtxWritePtr"
+defs["structs"]["ImDrawList"][9]["type"] = "ImDrawVert*"
 defs["structs"]["ImDrawList"][10] = {}
-defs["structs"]["ImDrawList"][10]["name"] = "_ClipRectStack"
-defs["structs"]["ImDrawList"][10]["template_type"] = "ImVec4"
-defs["structs"]["ImDrawList"][10]["type"] = "ImVector_ImVec4"
+defs["structs"]["ImDrawList"][10]["name"] = "_IdxWritePtr"
+defs["structs"]["ImDrawList"][10]["type"] = "ImDrawIdx*"
 defs["structs"]["ImDrawList"][11] = {}
-defs["structs"]["ImDrawList"][11]["name"] = "_TextureIdStack"
-defs["structs"]["ImDrawList"][11]["template_type"] = "ImTextureID"
-defs["structs"]["ImDrawList"][11]["type"] = "ImVector_ImTextureID"
+defs["structs"]["ImDrawList"][11]["name"] = "_ClipRectStack"
+defs["structs"]["ImDrawList"][11]["template_type"] = "ImVec4"
+defs["structs"]["ImDrawList"][11]["type"] = "ImVector_ImVec4"
 defs["structs"]["ImDrawList"][12] = {}
-defs["structs"]["ImDrawList"][12]["name"] = "_Path"
-defs["structs"]["ImDrawList"][12]["template_type"] = "ImVec2"
-defs["structs"]["ImDrawList"][12]["type"] = "ImVector_ImVec2"
+defs["structs"]["ImDrawList"][12]["name"] = "_TextureIdStack"
+defs["structs"]["ImDrawList"][12]["template_type"] = "ImTextureID"
+defs["structs"]["ImDrawList"][12]["type"] = "ImVector_ImTextureID"
 defs["structs"]["ImDrawList"][13] = {}
-defs["structs"]["ImDrawList"][13]["name"] = "_ChannelsCurrent"
-defs["structs"]["ImDrawList"][13]["type"] = "int"
+defs["structs"]["ImDrawList"][13]["name"] = "_Path"
+defs["structs"]["ImDrawList"][13]["template_type"] = "ImVec2"
+defs["structs"]["ImDrawList"][13]["type"] = "ImVector_ImVec2"
 defs["structs"]["ImDrawList"][14] = {}
-defs["structs"]["ImDrawList"][14]["name"] = "_ChannelsCount"
-defs["structs"]["ImDrawList"][14]["type"] = "int"
-defs["structs"]["ImDrawList"][15] = {}
-defs["structs"]["ImDrawList"][15]["name"] = "_Channels"
-defs["structs"]["ImDrawList"][15]["template_type"] = "ImDrawChannel"
-defs["structs"]["ImDrawList"][15]["type"] = "ImVector_ImDrawChannel"
+defs["structs"]["ImDrawList"][14]["name"] = "_Splitter"
+defs["structs"]["ImDrawList"][14]["type"] = "ImDrawListSplitter"
+defs["structs"]["ImDrawListSplitter"] = {}
+defs["structs"]["ImDrawListSplitter"][1] = {}
+defs["structs"]["ImDrawListSplitter"][1]["name"] = "_Current"
+defs["structs"]["ImDrawListSplitter"][1]["type"] = "int"
+defs["structs"]["ImDrawListSplitter"][2] = {}
+defs["structs"]["ImDrawListSplitter"][2]["name"] = "_Count"
+defs["structs"]["ImDrawListSplitter"][2]["type"] = "int"
+defs["structs"]["ImDrawListSplitter"][3] = {}
+defs["structs"]["ImDrawListSplitter"][3]["name"] = "_Channels"
+defs["structs"]["ImDrawListSplitter"][3]["template_type"] = "ImDrawChannel"
+defs["structs"]["ImDrawListSplitter"][3]["type"] = "ImVector_ImDrawChannel"
 defs["structs"]["ImDrawVert"] = {}
 defs["structs"]["ImDrawVert"][1] = {}
 defs["structs"]["ImDrawVert"][1]["name"] = "pos"
@@ -1535,8 +1575,8 @@ defs["structs"]["ImFontAtlas"][12]["template_type"] = "ImFont*"
 defs["structs"]["ImFontAtlas"][12]["type"] = "ImVector_ImFontPtr"
 defs["structs"]["ImFontAtlas"][13] = {}
 defs["structs"]["ImFontAtlas"][13]["name"] = "CustomRects"
-defs["structs"]["ImFontAtlas"][13]["template_type"] = "CustomRect"
-defs["structs"]["ImFontAtlas"][13]["type"] = "ImVector_CustomRect"
+defs["structs"]["ImFontAtlas"][13]["template_type"] = "ImFontAtlasCustomRect"
+defs["structs"]["ImFontAtlas"][13]["type"] = "ImVector_ImFontAtlasCustomRect"
 defs["structs"]["ImFontAtlas"][14] = {}
 defs["structs"]["ImFontAtlas"][14]["name"] = "ConfigData"
 defs["structs"]["ImFontAtlas"][14]["template_type"] = "ImFontConfig"
@@ -1545,6 +1585,31 @@ defs["structs"]["ImFontAtlas"][15] = {}
 defs["structs"]["ImFontAtlas"][15]["name"] = "CustomRectIds[1]"
 defs["structs"]["ImFontAtlas"][15]["size"] = 1
 defs["structs"]["ImFontAtlas"][15]["type"] = "int"
+defs["structs"]["ImFontAtlasCustomRect"] = {}
+defs["structs"]["ImFontAtlasCustomRect"][1] = {}
+defs["structs"]["ImFontAtlasCustomRect"][1]["name"] = "ID"
+defs["structs"]["ImFontAtlasCustomRect"][1]["type"] = "unsigned int"
+defs["structs"]["ImFontAtlasCustomRect"][2] = {}
+defs["structs"]["ImFontAtlasCustomRect"][2]["name"] = "Width"
+defs["structs"]["ImFontAtlasCustomRect"][2]["type"] = "unsigned short"
+defs["structs"]["ImFontAtlasCustomRect"][3] = {}
+defs["structs"]["ImFontAtlasCustomRect"][3]["name"] = "Height"
+defs["structs"]["ImFontAtlasCustomRect"][3]["type"] = "unsigned short"
+defs["structs"]["ImFontAtlasCustomRect"][4] = {}
+defs["structs"]["ImFontAtlasCustomRect"][4]["name"] = "X"
+defs["structs"]["ImFontAtlasCustomRect"][4]["type"] = "unsigned short"
+defs["structs"]["ImFontAtlasCustomRect"][5] = {}
+defs["structs"]["ImFontAtlasCustomRect"][5]["name"] = "Y"
+defs["structs"]["ImFontAtlasCustomRect"][5]["type"] = "unsigned short"
+defs["structs"]["ImFontAtlasCustomRect"][6] = {}
+defs["structs"]["ImFontAtlasCustomRect"][6]["name"] = "GlyphAdvanceX"
+defs["structs"]["ImFontAtlasCustomRect"][6]["type"] = "float"
+defs["structs"]["ImFontAtlasCustomRect"][7] = {}
+defs["structs"]["ImFontAtlasCustomRect"][7]["name"] = "GlyphOffset"
+defs["structs"]["ImFontAtlasCustomRect"][7]["type"] = "ImVec2"
+defs["structs"]["ImFontAtlasCustomRect"][8] = {}
+defs["structs"]["ImFontAtlasCustomRect"][8]["name"] = "Font"
+defs["structs"]["ImFontAtlasCustomRect"][8]["type"] = "ImFont*"
 defs["structs"]["ImFontConfig"] = {}
 defs["structs"]["ImFontConfig"][1] = {}
 defs["structs"]["ImFontConfig"][1]["name"] = "FontData"
@@ -1635,8 +1700,8 @@ defs["structs"]["ImFontGlyph"][10]["type"] = "float"
 defs["structs"]["ImFontGlyphRangesBuilder"] = {}
 defs["structs"]["ImFontGlyphRangesBuilder"][1] = {}
 defs["structs"]["ImFontGlyphRangesBuilder"][1]["name"] = "UsedChars"
-defs["structs"]["ImFontGlyphRangesBuilder"][1]["template_type"] = "int"
-defs["structs"]["ImFontGlyphRangesBuilder"][1]["type"] = "ImVector_int"
+defs["structs"]["ImFontGlyphRangesBuilder"][1]["template_type"] = "ImU32"
+defs["structs"]["ImFontGlyphRangesBuilder"][1]["type"] = "ImVector_ImU32"
 defs["structs"]["ImGuiIO"] = {}
 defs["structs"]["ImGuiIO"][1] = {}
 defs["structs"]["ImGuiIO"][1]["name"] = "ConfigFlags"
@@ -1670,7 +1735,7 @@ defs["structs"]["ImGuiIO"][10]["name"] = "MouseDragThreshold"
 defs["structs"]["ImGuiIO"][10]["type"] = "float"
 defs["structs"]["ImGuiIO"][11] = {}
 defs["structs"]["ImGuiIO"][11]["name"] = "KeyMap[ImGuiKey_COUNT]"
-defs["structs"]["ImGuiIO"][11]["size"] = 21
+defs["structs"]["ImGuiIO"][11]["size"] = 22
 defs["structs"]["ImGuiIO"][11]["type"] = "int"
 defs["structs"]["ImGuiIO"][12] = {}
 defs["structs"]["ImGuiIO"][12]["name"] = "KeyRepeatDelay"
@@ -1775,7 +1840,7 @@ defs["structs"]["ImGuiIO"][44]["size"] = 512
 defs["structs"]["ImGuiIO"][44]["type"] = "bool"
 defs["structs"]["ImGuiIO"][45] = {}
 defs["structs"]["ImGuiIO"][45]["name"] = "NavInputs[ImGuiNavInput_COUNT]"
-defs["structs"]["ImGuiIO"][45]["size"] = 21
+defs["structs"]["ImGuiIO"][45]["size"] = 22
 defs["structs"]["ImGuiIO"][45]["type"] = "float"
 defs["structs"]["ImGuiIO"][46] = {}
 defs["structs"]["ImGuiIO"][46]["name"] = "WantCaptureMouse"
@@ -1847,41 +1912,45 @@ defs["structs"]["ImGuiIO"][66]["name"] = "MouseDownOwned[5]"
 defs["structs"]["ImGuiIO"][66]["size"] = 5
 defs["structs"]["ImGuiIO"][66]["type"] = "bool"
 defs["structs"]["ImGuiIO"][67] = {}
-defs["structs"]["ImGuiIO"][67]["name"] = "MouseDownDuration[5]"
+defs["structs"]["ImGuiIO"][67]["name"] = "MouseDownWasDoubleClick[5]"
 defs["structs"]["ImGuiIO"][67]["size"] = 5
-defs["structs"]["ImGuiIO"][67]["type"] = "float"
+defs["structs"]["ImGuiIO"][67]["type"] = "bool"
 defs["structs"]["ImGuiIO"][68] = {}
-defs["structs"]["ImGuiIO"][68]["name"] = "MouseDownDurationPrev[5]"
+defs["structs"]["ImGuiIO"][68]["name"] = "MouseDownDuration[5]"
 defs["structs"]["ImGuiIO"][68]["size"] = 5
 defs["structs"]["ImGuiIO"][68]["type"] = "float"
 defs["structs"]["ImGuiIO"][69] = {}
-defs["structs"]["ImGuiIO"][69]["name"] = "MouseDragMaxDistanceAbs[5]"
+defs["structs"]["ImGuiIO"][69]["name"] = "MouseDownDurationPrev[5]"
 defs["structs"]["ImGuiIO"][69]["size"] = 5
-defs["structs"]["ImGuiIO"][69]["type"] = "ImVec2"
+defs["structs"]["ImGuiIO"][69]["type"] = "float"
 defs["structs"]["ImGuiIO"][70] = {}
-defs["structs"]["ImGuiIO"][70]["name"] = "MouseDragMaxDistanceSqr[5]"
+defs["structs"]["ImGuiIO"][70]["name"] = "MouseDragMaxDistanceAbs[5]"
 defs["structs"]["ImGuiIO"][70]["size"] = 5
-defs["structs"]["ImGuiIO"][70]["type"] = "float"
+defs["structs"]["ImGuiIO"][70]["type"] = "ImVec2"
 defs["structs"]["ImGuiIO"][71] = {}
-defs["structs"]["ImGuiIO"][71]["name"] = "KeysDownDuration[512]"
-defs["structs"]["ImGuiIO"][71]["size"] = 512
+defs["structs"]["ImGuiIO"][71]["name"] = "MouseDragMaxDistanceSqr[5]"
+defs["structs"]["ImGuiIO"][71]["size"] = 5
 defs["structs"]["ImGuiIO"][71]["type"] = "float"
 defs["structs"]["ImGuiIO"][72] = {}
-defs["structs"]["ImGuiIO"][72]["name"] = "KeysDownDurationPrev[512]"
+defs["structs"]["ImGuiIO"][72]["name"] = "KeysDownDuration[512]"
 defs["structs"]["ImGuiIO"][72]["size"] = 512
 defs["structs"]["ImGuiIO"][72]["type"] = "float"
 defs["structs"]["ImGuiIO"][73] = {}
-defs["structs"]["ImGuiIO"][73]["name"] = "NavInputsDownDuration[ImGuiNavInput_COUNT]"
-defs["structs"]["ImGuiIO"][73]["size"] = 21
+defs["structs"]["ImGuiIO"][73]["name"] = "KeysDownDurationPrev[512]"
+defs["structs"]["ImGuiIO"][73]["size"] = 512
 defs["structs"]["ImGuiIO"][73]["type"] = "float"
 defs["structs"]["ImGuiIO"][74] = {}
-defs["structs"]["ImGuiIO"][74]["name"] = "NavInputsDownDurationPrev[ImGuiNavInput_COUNT]"
-defs["structs"]["ImGuiIO"][74]["size"] = 21
+defs["structs"]["ImGuiIO"][74]["name"] = "NavInputsDownDuration[ImGuiNavInput_COUNT]"
+defs["structs"]["ImGuiIO"][74]["size"] = 22
 defs["structs"]["ImGuiIO"][74]["type"] = "float"
 defs["structs"]["ImGuiIO"][75] = {}
-defs["structs"]["ImGuiIO"][75]["name"] = "InputQueueCharacters"
-defs["structs"]["ImGuiIO"][75]["template_type"] = "ImWchar"
-defs["structs"]["ImGuiIO"][75]["type"] = "ImVector_ImWchar"
+defs["structs"]["ImGuiIO"][75]["name"] = "NavInputsDownDurationPrev[ImGuiNavInput_COUNT]"
+defs["structs"]["ImGuiIO"][75]["size"] = 22
+defs["structs"]["ImGuiIO"][75]["type"] = "float"
+defs["structs"]["ImGuiIO"][76] = {}
+defs["structs"]["ImGuiIO"][76]["name"] = "InputQueueCharacters"
+defs["structs"]["ImGuiIO"][76]["template_type"] = "ImWchar"
+defs["structs"]["ImGuiIO"][76]["type"] = "ImVector_ImWchar"
 defs["structs"]["ImGuiInputTextCallbackData"] = {}
 defs["structs"]["ImGuiInputTextCallbackData"][1] = {}
 defs["structs"]["ImGuiInputTextCallbackData"][1]["name"] = "EventFlag"
@@ -1984,8 +2053,15 @@ defs["structs"]["ImGuiSizeCallbackData"][4]["type"] = "ImVec2"
 defs["structs"]["ImGuiStorage"] = {}
 defs["structs"]["ImGuiStorage"][1] = {}
 defs["structs"]["ImGuiStorage"][1]["name"] = "Data"
-defs["structs"]["ImGuiStorage"][1]["template_type"] = "Pair"
-defs["structs"]["ImGuiStorage"][1]["type"] = "ImVector_Pair"
+defs["structs"]["ImGuiStorage"][1]["template_type"] = "ImGuiStoragePair"
+defs["structs"]["ImGuiStorage"][1]["type"] = "ImVector_ImGuiStoragePair"
+defs["structs"]["ImGuiStoragePair"] = {}
+defs["structs"]["ImGuiStoragePair"][1] = {}
+defs["structs"]["ImGuiStoragePair"][1]["name"] = "key"
+defs["structs"]["ImGuiStoragePair"][1]["type"] = "ImGuiID"
+defs["structs"]["ImGuiStoragePair"][2] = {}
+defs["structs"]["ImGuiStoragePair"][2]["name"] = ""
+defs["structs"]["ImGuiStoragePair"][2]["type"] = "union { int val_i; float val_f; void* val_p;}"
 defs["structs"]["ImGuiStyle"] = {}
 defs["structs"]["ImGuiStyle"][1] = {}
 defs["structs"]["ImGuiStyle"][1]["name"] = "Alpha"
@@ -2006,87 +2082,93 @@ defs["structs"]["ImGuiStyle"][6] = {}
 defs["structs"]["ImGuiStyle"][6]["name"] = "WindowTitleAlign"
 defs["structs"]["ImGuiStyle"][6]["type"] = "ImVec2"
 defs["structs"]["ImGuiStyle"][7] = {}
-defs["structs"]["ImGuiStyle"][7]["name"] = "ChildRounding"
-defs["structs"]["ImGuiStyle"][7]["type"] = "float"
+defs["structs"]["ImGuiStyle"][7]["name"] = "WindowMenuButtonPosition"
+defs["structs"]["ImGuiStyle"][7]["type"] = "ImGuiDir"
 defs["structs"]["ImGuiStyle"][8] = {}
-defs["structs"]["ImGuiStyle"][8]["name"] = "ChildBorderSize"
+defs["structs"]["ImGuiStyle"][8]["name"] = "ChildRounding"
 defs["structs"]["ImGuiStyle"][8]["type"] = "float"
 defs["structs"]["ImGuiStyle"][9] = {}
-defs["structs"]["ImGuiStyle"][9]["name"] = "PopupRounding"
+defs["structs"]["ImGuiStyle"][9]["name"] = "ChildBorderSize"
 defs["structs"]["ImGuiStyle"][9]["type"] = "float"
 defs["structs"]["ImGuiStyle"][10] = {}
-defs["structs"]["ImGuiStyle"][10]["name"] = "PopupBorderSize"
+defs["structs"]["ImGuiStyle"][10]["name"] = "PopupRounding"
 defs["structs"]["ImGuiStyle"][10]["type"] = "float"
 defs["structs"]["ImGuiStyle"][11] = {}
-defs["structs"]["ImGuiStyle"][11]["name"] = "FramePadding"
-defs["structs"]["ImGuiStyle"][11]["type"] = "ImVec2"
+defs["structs"]["ImGuiStyle"][11]["name"] = "PopupBorderSize"
+defs["structs"]["ImGuiStyle"][11]["type"] = "float"
 defs["structs"]["ImGuiStyle"][12] = {}
-defs["structs"]["ImGuiStyle"][12]["name"] = "FrameRounding"
-defs["structs"]["ImGuiStyle"][12]["type"] = "float"
+defs["structs"]["ImGuiStyle"][12]["name"] = "FramePadding"
+defs["structs"]["ImGuiStyle"][12]["type"] = "ImVec2"
 defs["structs"]["ImGuiStyle"][13] = {}
-defs["structs"]["ImGuiStyle"][13]["name"] = "FrameBorderSize"
+defs["structs"]["ImGuiStyle"][13]["name"] = "FrameRounding"
 defs["structs"]["ImGuiStyle"][13]["type"] = "float"
 defs["structs"]["ImGuiStyle"][14] = {}
-defs["structs"]["ImGuiStyle"][14]["name"] = "ItemSpacing"
-defs["structs"]["ImGuiStyle"][14]["type"] = "ImVec2"
+defs["structs"]["ImGuiStyle"][14]["name"] = "FrameBorderSize"
+defs["structs"]["ImGuiStyle"][14]["type"] = "float"
 defs["structs"]["ImGuiStyle"][15] = {}
-defs["structs"]["ImGuiStyle"][15]["name"] = "ItemInnerSpacing"
+defs["structs"]["ImGuiStyle"][15]["name"] = "ItemSpacing"
 defs["structs"]["ImGuiStyle"][15]["type"] = "ImVec2"
 defs["structs"]["ImGuiStyle"][16] = {}
-defs["structs"]["ImGuiStyle"][16]["name"] = "TouchExtraPadding"
+defs["structs"]["ImGuiStyle"][16]["name"] = "ItemInnerSpacing"
 defs["structs"]["ImGuiStyle"][16]["type"] = "ImVec2"
 defs["structs"]["ImGuiStyle"][17] = {}
-defs["structs"]["ImGuiStyle"][17]["name"] = "IndentSpacing"
-defs["structs"]["ImGuiStyle"][17]["type"] = "float"
+defs["structs"]["ImGuiStyle"][17]["name"] = "TouchExtraPadding"
+defs["structs"]["ImGuiStyle"][17]["type"] = "ImVec2"
 defs["structs"]["ImGuiStyle"][18] = {}
-defs["structs"]["ImGuiStyle"][18]["name"] = "ColumnsMinSpacing"
+defs["structs"]["ImGuiStyle"][18]["name"] = "IndentSpacing"
 defs["structs"]["ImGuiStyle"][18]["type"] = "float"
 defs["structs"]["ImGuiStyle"][19] = {}
-defs["structs"]["ImGuiStyle"][19]["name"] = "ScrollbarSize"
+defs["structs"]["ImGuiStyle"][19]["name"] = "ColumnsMinSpacing"
 defs["structs"]["ImGuiStyle"][19]["type"] = "float"
 defs["structs"]["ImGuiStyle"][20] = {}
-defs["structs"]["ImGuiStyle"][20]["name"] = "ScrollbarRounding"
+defs["structs"]["ImGuiStyle"][20]["name"] = "ScrollbarSize"
 defs["structs"]["ImGuiStyle"][20]["type"] = "float"
 defs["structs"]["ImGuiStyle"][21] = {}
-defs["structs"]["ImGuiStyle"][21]["name"] = "GrabMinSize"
+defs["structs"]["ImGuiStyle"][21]["name"] = "ScrollbarRounding"
 defs["structs"]["ImGuiStyle"][21]["type"] = "float"
 defs["structs"]["ImGuiStyle"][22] = {}
-defs["structs"]["ImGuiStyle"][22]["name"] = "GrabRounding"
+defs["structs"]["ImGuiStyle"][22]["name"] = "GrabMinSize"
 defs["structs"]["ImGuiStyle"][22]["type"] = "float"
 defs["structs"]["ImGuiStyle"][23] = {}
-defs["structs"]["ImGuiStyle"][23]["name"] = "TabRounding"
+defs["structs"]["ImGuiStyle"][23]["name"] = "GrabRounding"
 defs["structs"]["ImGuiStyle"][23]["type"] = "float"
 defs["structs"]["ImGuiStyle"][24] = {}
-defs["structs"]["ImGuiStyle"][24]["name"] = "TabBorderSize"
+defs["structs"]["ImGuiStyle"][24]["name"] = "TabRounding"
 defs["structs"]["ImGuiStyle"][24]["type"] = "float"
 defs["structs"]["ImGuiStyle"][25] = {}
-defs["structs"]["ImGuiStyle"][25]["name"] = "ButtonTextAlign"
-defs["structs"]["ImGuiStyle"][25]["type"] = "ImVec2"
+defs["structs"]["ImGuiStyle"][25]["name"] = "TabBorderSize"
+defs["structs"]["ImGuiStyle"][25]["type"] = "float"
 defs["structs"]["ImGuiStyle"][26] = {}
-defs["structs"]["ImGuiStyle"][26]["name"] = "SelectableTextAlign"
-defs["structs"]["ImGuiStyle"][26]["type"] = "ImVec2"
+defs["structs"]["ImGuiStyle"][26]["name"] = "ColorButtonPosition"
+defs["structs"]["ImGuiStyle"][26]["type"] = "ImGuiDir"
 defs["structs"]["ImGuiStyle"][27] = {}
-defs["structs"]["ImGuiStyle"][27]["name"] = "DisplayWindowPadding"
+defs["structs"]["ImGuiStyle"][27]["name"] = "ButtonTextAlign"
 defs["structs"]["ImGuiStyle"][27]["type"] = "ImVec2"
 defs["structs"]["ImGuiStyle"][28] = {}
-defs["structs"]["ImGuiStyle"][28]["name"] = "DisplaySafeAreaPadding"
+defs["structs"]["ImGuiStyle"][28]["name"] = "SelectableTextAlign"
 defs["structs"]["ImGuiStyle"][28]["type"] = "ImVec2"
 defs["structs"]["ImGuiStyle"][29] = {}
-defs["structs"]["ImGuiStyle"][29]["name"] = "MouseCursorScale"
-defs["structs"]["ImGuiStyle"][29]["type"] = "float"
+defs["structs"]["ImGuiStyle"][29]["name"] = "DisplayWindowPadding"
+defs["structs"]["ImGuiStyle"][29]["type"] = "ImVec2"
 defs["structs"]["ImGuiStyle"][30] = {}
-defs["structs"]["ImGuiStyle"][30]["name"] = "AntiAliasedLines"
-defs["structs"]["ImGuiStyle"][30]["type"] = "bool"
+defs["structs"]["ImGuiStyle"][30]["name"] = "DisplaySafeAreaPadding"
+defs["structs"]["ImGuiStyle"][30]["type"] = "ImVec2"
 defs["structs"]["ImGuiStyle"][31] = {}
-defs["structs"]["ImGuiStyle"][31]["name"] = "AntiAliasedFill"
-defs["structs"]["ImGuiStyle"][31]["type"] = "bool"
+defs["structs"]["ImGuiStyle"][31]["name"] = "MouseCursorScale"
+defs["structs"]["ImGuiStyle"][31]["type"] = "float"
 defs["structs"]["ImGuiStyle"][32] = {}
-defs["structs"]["ImGuiStyle"][32]["name"] = "CurveTessellationTol"
-defs["structs"]["ImGuiStyle"][32]["type"] = "float"
+defs["structs"]["ImGuiStyle"][32]["name"] = "AntiAliasedLines"
+defs["structs"]["ImGuiStyle"][32]["type"] = "bool"
 defs["structs"]["ImGuiStyle"][33] = {}
-defs["structs"]["ImGuiStyle"][33]["name"] = "Colors[ImGuiCol_COUNT]"
-defs["structs"]["ImGuiStyle"][33]["size"] = 48
-defs["structs"]["ImGuiStyle"][33]["type"] = "ImVec4"
+defs["structs"]["ImGuiStyle"][33]["name"] = "AntiAliasedFill"
+defs["structs"]["ImGuiStyle"][33]["type"] = "bool"
+defs["structs"]["ImGuiStyle"][34] = {}
+defs["structs"]["ImGuiStyle"][34]["name"] = "CurveTessellationTol"
+defs["structs"]["ImGuiStyle"][34]["type"] = "float"
+defs["structs"]["ImGuiStyle"][35] = {}
+defs["structs"]["ImGuiStyle"][35]["name"] = "Colors[ImGuiCol_COUNT]"
+defs["structs"]["ImGuiStyle"][35]["size"] = 48
+defs["structs"]["ImGuiStyle"][35]["type"] = "ImVec4"
 defs["structs"]["ImGuiTextBuffer"] = {}
 defs["structs"]["ImGuiTextBuffer"][1] = {}
 defs["structs"]["ImGuiTextBuffer"][1]["name"] = "Buf"
@@ -2099,11 +2181,18 @@ defs["structs"]["ImGuiTextFilter"][1]["size"] = 256
 defs["structs"]["ImGuiTextFilter"][1]["type"] = "char"
 defs["structs"]["ImGuiTextFilter"][2] = {}
 defs["structs"]["ImGuiTextFilter"][2]["name"] = "Filters"
-defs["structs"]["ImGuiTextFilter"][2]["template_type"] = "TextRange"
-defs["structs"]["ImGuiTextFilter"][2]["type"] = "ImVector_TextRange"
+defs["structs"]["ImGuiTextFilter"][2]["template_type"] = "ImGuiTextRange"
+defs["structs"]["ImGuiTextFilter"][2]["type"] = "ImVector_ImGuiTextRange"
 defs["structs"]["ImGuiTextFilter"][3] = {}
 defs["structs"]["ImGuiTextFilter"][3]["name"] = "CountGrep"
 defs["structs"]["ImGuiTextFilter"][3]["type"] = "int"
+defs["structs"]["ImGuiTextRange"] = {}
+defs["structs"]["ImGuiTextRange"][1] = {}
+defs["structs"]["ImGuiTextRange"][1]["name"] = "b"
+defs["structs"]["ImGuiTextRange"][1]["type"] = "const char*"
+defs["structs"]["ImGuiTextRange"][2] = {}
+defs["structs"]["ImGuiTextRange"][2]["name"] = "e"
+defs["structs"]["ImGuiTextRange"][2]["type"] = "const char*"
 defs["structs"]["ImVec2"] = {}
 defs["structs"]["ImVec2"][1] = {}
 defs["structs"]["ImVec2"][1]["name"] = "x"
@@ -2124,19 +2213,5 @@ defs["structs"]["ImVec4"][3]["type"] = "float"
 defs["structs"]["ImVec4"][4] = {}
 defs["structs"]["ImVec4"][4]["name"] = "w"
 defs["structs"]["ImVec4"][4]["type"] = "float"
-defs["structs"]["Pair"] = {}
-defs["structs"]["Pair"][1] = {}
-defs["structs"]["Pair"][1]["name"] = "key"
-defs["structs"]["Pair"][1]["type"] = "ImGuiID"
-defs["structs"]["Pair"][2] = {}
-defs["structs"]["Pair"][2]["name"] = ""
-defs["structs"]["Pair"][2]["type"] = "union { int val_i; float val_f; void* val_p;}"
-defs["structs"]["TextRange"] = {}
-defs["structs"]["TextRange"][1] = {}
-defs["structs"]["TextRange"][1]["name"] = "b"
-defs["structs"]["TextRange"][1]["type"] = "const char*"
-defs["structs"]["TextRange"][2] = {}
-defs["structs"]["TextRange"][2]["name"] = "e"
-defs["structs"]["TextRange"][2]["type"] = "const char*"
 
 return defs

generator/output/typedefs_dict.json

@@ -1,5 +1,4 @@
 {
-  "CustomRect": "struct CustomRect",
   "ImColor": "struct ImColor",
   "ImDrawCallback": "void(*)(const ImDrawList* parent_list,const ImDrawCmd* cmd);",
   "ImDrawChannel": "struct ImDrawChannel",
@@ -10,9 +9,11 @@
   "ImDrawList": "struct ImDrawList",
   "ImDrawListFlags": "int",
   "ImDrawListSharedData": "struct ImDrawListSharedData",
+  "ImDrawListSplitter": "struct ImDrawListSplitter",
   "ImDrawVert": "struct ImDrawVert",
   "ImFont": "struct ImFont",
   "ImFontAtlas": "struct ImFontAtlas",
+  "ImFontAtlasCustomRect": "struct ImFontAtlasCustomRect",
   "ImFontAtlasFlags": "int",
   "ImFontConfig": "struct ImFontConfig",
   "ImFontGlyph": "struct ImFontGlyph",
@@ -20,7 +21,6 @@
   "ImGuiBackendFlags": "int",
   "ImGuiCol": "int",
   "ImGuiColorEditFlags": "int",
-  "ImGuiColumnsFlags": "int",
   "ImGuiComboFlags": "int",
   "ImGuiCond": "int",
   "ImGuiConfigFlags": "int",
@@ -45,24 +45,28 @@
   "ImGuiSizeCallback": "void(*)(ImGuiSizeCallbackData* data);",
   "ImGuiSizeCallbackData": "struct ImGuiSizeCallbackData",
   "ImGuiStorage": "struct ImGuiStorage",
+  "ImGuiStoragePair": "struct ImGuiStoragePair",
   "ImGuiStyle": "struct ImGuiStyle",
   "ImGuiStyleVar": "int",
   "ImGuiTabBarFlags": "int",
   "ImGuiTabItemFlags": "int",
   "ImGuiTextBuffer": "struct ImGuiTextBuffer",
   "ImGuiTextFilter": "struct ImGuiTextFilter",
+  "ImGuiTextRange": "struct ImGuiTextRange",
   "ImGuiTreeNodeFlags": "int",
   "ImGuiWindowFlags": "int",
+  "ImS16": "signed short",
   "ImS32": "signed int",
   "ImS64": "int64_t",
+  "ImS8": "signed char",
   "ImTextureID": "void*",
+  "ImU16": "unsigned short",
   "ImU32": "unsigned int",
   "ImU64": "uint64_t",
+  "ImU8": "unsigned char",
   "ImVec2": "struct ImVec2",
   "ImVec4": "struct ImVec4",
   "ImWchar": "unsigned short",
-  "Pair": "struct Pair",
-  "TextRange": "struct TextRange",
   "const_iterator": "const value_type*",
   "iterator": "value_type*",
   "value_type": "T"

generator/output/typedefs_dict.lua

@@ -1,5 +1,4 @@
 local defs = {}
-defs["CustomRect"] = "struct CustomRect"
 defs["ImColor"] = "struct ImColor"
 defs["ImDrawCallback"] = "void(*)(const ImDrawList* parent_list,const ImDrawCmd* cmd);"
 defs["ImDrawChannel"] = "struct ImDrawChannel"
@@ -10,9 +9,11 @@ defs["ImDrawIdx"] = "unsigned short"
 defs["ImDrawList"] = "struct ImDrawList"
 defs["ImDrawListFlags"] = "int"
 defs["ImDrawListSharedData"] = "struct ImDrawListSharedData"
+defs["ImDrawListSplitter"] = "struct ImDrawListSplitter"
 defs["ImDrawVert"] = "struct ImDrawVert"
 defs["ImFont"] = "struct ImFont"
 defs["ImFontAtlas"] = "struct ImFontAtlas"
+defs["ImFontAtlasCustomRect"] = "struct ImFontAtlasCustomRect"
 defs["ImFontAtlasFlags"] = "int"
 defs["ImFontConfig"] = "struct ImFontConfig"
 defs["ImFontGlyph"] = "struct ImFontGlyph"
@@ -20,7 +21,6 @@ defs["ImFontGlyphRangesBuilder"] = "struct ImFontGlyphRangesBuilder"
 defs["ImGuiBackendFlags"] = "int"
 defs["ImGuiCol"] = "int"
 defs["ImGuiColorEditFlags"] = "int"
-defs["ImGuiColumnsFlags"] = "int"
 defs["ImGuiComboFlags"] = "int"
 defs["ImGuiCond"] = "int"
 defs["ImGuiConfigFlags"] = "int"
@@ -45,24 +45,28 @@ defs["ImGuiSelectableFlags"] = "int"
 defs["ImGuiSizeCallback"] = "void(*)(ImGuiSizeCallbackData* data);"
 defs["ImGuiSizeCallbackData"] = "struct ImGuiSizeCallbackData"
 defs["ImGuiStorage"] = "struct ImGuiStorage"
+defs["ImGuiStoragePair"] = "struct ImGuiStoragePair"
 defs["ImGuiStyle"] = "struct ImGuiStyle"
 defs["ImGuiStyleVar"] = "int"
 defs["ImGuiTabBarFlags"] = "int"
 defs["ImGuiTabItemFlags"] = "int"
 defs["ImGuiTextBuffer"] = "struct ImGuiTextBuffer"
 defs["ImGuiTextFilter"] = "struct ImGuiTextFilter"
+defs["ImGuiTextRange"] = "struct ImGuiTextRange"
 defs["ImGuiTreeNodeFlags"] = "int"
 defs["ImGuiWindowFlags"] = "int"
+defs["ImS16"] = "signed short"
 defs["ImS32"] = "signed int"
 defs["ImS64"] = "int64_t"
+defs["ImS8"] = "signed char"
 defs["ImTextureID"] = "void*"
+defs["ImU16"] = "unsigned short"
 defs["ImU32"] = "unsigned int"
 defs["ImU64"] = "uint64_t"
+defs["ImU8"] = "unsigned char"
 defs["ImVec2"] = "struct ImVec2"
 defs["ImVec4"] = "struct ImVec4"
 defs["ImWchar"] = "unsigned short"
-defs["Pair"] = "struct Pair"
-defs["TextRange"] = "struct TextRange"
 defs["const_iterator"] = "const value_type*"
 defs["iterator"] = "value_type*"
 defs["value_type"] = "T"