kennethnym/cimgui
1
0
Fork 0
mirror of https://github.com/cimgui/cimgui.git synced 2025-10-09 11:21:38 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

drop nonUDT1 second (not dropping but take place of no nonUDT)

Browse Source
This commit is contained in:
Victor Bombi
2020-03-27 13:49:16 +01:00
parent 0e16e0aedc
commit 760662ecea
3 changed files with 391 additions and 578 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
generator/cpp2ffi.lua
View File

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

243
generator/output/definitions.json
View File

@@ -1,8 +1,12 @@
{ {
"ImColor_HSV": [ "ImColor_HSV": [
{ {
"args": "(ImColor* self,float h,float s,float v,float a)", "args": "(ImColor *pOut,ImColor* self,float h,float s,float v,float a)",
"argsT": [ "argsT": [
{
"name": "pOut",
"type": "ImColor*"
},
{ {
"name": "self", "name": "self",
"type": "ImColor*" "type": "ImColor*"
@@ -31,8 +35,9 @@
"a": "1.0f" "a": "1.0f"
}, },
"funcname": "HSV", "funcname": "HSV",
"nonUDT": 1,
"ov_cimguiname": "ImColor_HSV", "ov_cimguiname": "ImColor_HSV",
"ret": "ImColor", "ret": "void",
"signature": "(float,float,float,float)", "signature": "(float,float,float,float)",
"stname": "ImColor" "stname": "ImColor"
} }
@@ -1551,8 +1556,12 @@
], ],
"ImDrawList_GetClipRectMax": [ "ImDrawList_GetClipRectMax": [
{ {
"args": "(ImDrawList* self)", "args": "(ImVec2 *pOut,ImDrawList* self)",
"argsT": [ "argsT": [
{
"name": "pOut",
"type": "ImVec2*"
},
{ {
"name": "self", "name": "self",
"type": "ImDrawList*" "type": "ImDrawList*"
@@ -1563,16 +1572,21 @@
"cimguiname": "ImDrawList_GetClipRectMax", "cimguiname": "ImDrawList_GetClipRectMax",
"defaults": [], "defaults": [],
"funcname": "GetClipRectMax", "funcname": "GetClipRectMax",
"nonUDT": 1,
"ov_cimguiname": "ImDrawList_GetClipRectMax", "ov_cimguiname": "ImDrawList_GetClipRectMax",
"ret": "ImVec2", "ret": "void",
"signature": "()const", "signature": "()const",
"stname": "ImDrawList" "stname": "ImDrawList"
} }
], ],
"ImDrawList_GetClipRectMin": [ "ImDrawList_GetClipRectMin": [
{ {
"args": "(ImDrawList* self)", "args": "(ImVec2 *pOut,ImDrawList* self)",
"argsT": [ "argsT": [
{
"name": "pOut",
"type": "ImVec2*"
},
{ {
"name": "self", "name": "self",
"type": "ImDrawList*" "type": "ImDrawList*"
@@ -1583,8 +1597,9 @@
"cimguiname": "ImDrawList_GetClipRectMin", "cimguiname": "ImDrawList_GetClipRectMin",
"defaults": [], "defaults": [],
"funcname": "GetClipRectMin", "funcname": "GetClipRectMin",
"nonUDT": 1,
"ov_cimguiname": "ImDrawList_GetClipRectMin", "ov_cimguiname": "ImDrawList_GetClipRectMin",
"ret": "ImVec2", "ret": "void",
"signature": "()const", "signature": "()const",
"stname": "ImDrawList" "stname": "ImDrawList"
} }
@@ -3549,8 +3564,12 @@
], ],
"ImFont_CalcTextSizeA": [ "ImFont_CalcTextSizeA": [
{ {
"args": "(ImFont* self,float size,float max_width,float wrap_width,const char* text_begin,const char* text_end,const char** remaining)", "args": "(ImVec2 *pOut,ImFont* self,float size,float max_width,float wrap_width,const char* text_begin,const char* text_end,const char** remaining)",
"argsT": [ "argsT": [
{
"name": "pOut",
"type": "ImVec2*"
},
{ {
"name": "self", "name": "self",
"type": "ImFont*" "type": "ImFont*"
@@ -3588,8 +3607,9 @@
"text_end": "((void*)0)" "text_end": "((void*)0)"
}, },
"funcname": "CalcTextSizeA", "funcname": "CalcTextSizeA",
"nonUDT": 1,
"ov_cimguiname": "ImFont_CalcTextSizeA", "ov_cimguiname": "ImFont_CalcTextSizeA",
"ret": "ImVec2", "ret": "void",
"signature": "(float,float,float,const char*,const char*,const char**)const", "signature": "(float,float,float,const char*,const char*,const char**)const",
"stname": "ImFont" "stname": "ImFont"
} }
@@ -7153,8 +7173,12 @@
], ],
"igCalcTextSize": [ "igCalcTextSize": [
{ {
"args": "(const char* text,const char* text_end,bool hide_text_after_double_hash,float wrap_width)", "args": "(ImVec2 *pOut,const char* text,const char* text_end,bool hide_text_after_double_hash,float wrap_width)",
"argsT": [ "argsT": [
{
"name": "pOut",
"type": "ImVec2*"
},
{ {
"name": "text", "name": "text",
"type": "const char*" "type": "const char*"
@@ -7182,8 +7206,9 @@
}, },
"funcname": "CalcTextSize", "funcname": "CalcTextSize",
"namespace": "ImGui", "namespace": "ImGui",
"nonUDT": 1,
"ov_cimguiname": "igCalcTextSize", "ov_cimguiname": "igCalcTextSize",
"ret": "ImVec2", "ret": "void",
"signature": "(const char*,const char*,bool,float)", "signature": "(const char*,const char*,bool,float)",
"stname": "" "stname": ""
} }
@@ -7503,8 +7528,12 @@
], ],
"igColorConvertU32ToFloat4": [ "igColorConvertU32ToFloat4": [
{ {
"args": "(ImU32 in)", "args": "(ImVec4 *pOut,ImU32 in)",
"argsT": [ "argsT": [
{
"name": "pOut",
"type": "ImVec4*"
},
{ {
"name": "in", "name": "in",
"type": "ImU32" "type": "ImU32"
@@ -7516,8 +7545,9 @@
"defaults": [], "defaults": [],
"funcname": "ColorConvertU32ToFloat4", "funcname": "ColorConvertU32ToFloat4",
"namespace": "ImGui", "namespace": "ImGui",
"nonUDT": 1,
"ov_cimguiname": "igColorConvertU32ToFloat4", "ov_cimguiname": "igColorConvertU32ToFloat4",
"ret": "ImVec4", "ret": "void",
"signature": "(ImU32)", "signature": "(ImU32)",
"stname": "" "stname": ""
} }
@@ -8943,32 +8973,44 @@
], ],
"igGetContentRegionAvail": [ "igGetContentRegionAvail": [
{ {
"args": "()", "args": "(ImVec2 *pOut)",
"argsT": [], "argsT": [
{
"name": "pOut",
"type": "ImVec2*"
}
],
"argsoriginal": "()", "argsoriginal": "()",
"call_args": "()", "call_args": "()",
"cimguiname": "igGetContentRegionAvail", "cimguiname": "igGetContentRegionAvail",
"defaults": [], "defaults": [],
"funcname": "GetContentRegionAvail", "funcname": "GetContentRegionAvail",
"namespace": "ImGui", "namespace": "ImGui",
"nonUDT": 1,
"ov_cimguiname": "igGetContentRegionAvail", "ov_cimguiname": "igGetContentRegionAvail",
"ret": "ImVec2", "ret": "void",
"signature": "()", "signature": "()",
"stname": "" "stname": ""
} }
], ],
"igGetContentRegionMax": [ "igGetContentRegionMax": [
{ {
"args": "()", "args": "(ImVec2 *pOut)",
"argsT": [], "argsT": [
{
"name": "pOut",
"type": "ImVec2*"
}
],
"argsoriginal": "()", "argsoriginal": "()",
"call_args": "()", "call_args": "()",
"cimguiname": "igGetContentRegionMax", "cimguiname": "igGetContentRegionMax",
"defaults": [], "defaults": [],
"funcname": "GetContentRegionMax", "funcname": "GetContentRegionMax",
"namespace": "ImGui", "namespace": "ImGui",
"nonUDT": 1,
"ov_cimguiname": "igGetContentRegionMax", "ov_cimguiname": "igGetContentRegionMax",
"ret": "ImVec2", "ret": "void",
"signature": "()", "signature": "()",
"stname": "" "stname": ""
} }
@@ -8991,16 +9033,22 @@
], ],
"igGetCursorPos": [ "igGetCursorPos": [
{ {
"args": "()", "args": "(ImVec2 *pOut)",
"argsT": [], "argsT": [
{
"name": "pOut",
"type": "ImVec2*"
}
],
"argsoriginal": "()", "argsoriginal": "()",
"call_args": "()", "call_args": "()",
"cimguiname": "igGetCursorPos", "cimguiname": "igGetCursorPos",
"defaults": [], "defaults": [],
"funcname": "GetCursorPos", "funcname": "GetCursorPos",
"namespace": "ImGui", "namespace": "ImGui",
"nonUDT": 1,
"ov_cimguiname": "igGetCursorPos", "ov_cimguiname": "igGetCursorPos",
"ret": "ImVec2", "ret": "void",
"signature": "()", "signature": "()",
"stname": "" "stname": ""
} }
@@ -9039,32 +9087,44 @@
], ],
"igGetCursorScreenPos": [ "igGetCursorScreenPos": [
{ {
"args": "()", "args": "(ImVec2 *pOut)",
"argsT": [], "argsT": [
{
"name": "pOut",
"type": "ImVec2*"
}
],
"argsoriginal": "()", "argsoriginal": "()",
"call_args": "()", "call_args": "()",
"cimguiname": "igGetCursorScreenPos", "cimguiname": "igGetCursorScreenPos",
"defaults": [], "defaults": [],
"funcname": "GetCursorScreenPos", "funcname": "GetCursorScreenPos",
"namespace": "ImGui", "namespace": "ImGui",
"nonUDT": 1,
"ov_cimguiname": "igGetCursorScreenPos", "ov_cimguiname": "igGetCursorScreenPos",
"ret": "ImVec2", "ret": "void",
"signature": "()", "signature": "()",
"stname": "" "stname": ""
} }
], ],
"igGetCursorStartPos": [ "igGetCursorStartPos": [
{ {
"args": "()", "args": "(ImVec2 *pOut)",
"argsT": [], "argsT": [
{
"name": "pOut",
"type": "ImVec2*"
}
],
"argsoriginal": "()", "argsoriginal": "()",
"call_args": "()", "call_args": "()",
"cimguiname": "igGetCursorStartPos", "cimguiname": "igGetCursorStartPos",
"defaults": [], "defaults": [],
"funcname": "GetCursorStartPos", "funcname": "GetCursorStartPos",
"namespace": "ImGui", "namespace": "ImGui",
"nonUDT": 1,
"ov_cimguiname": "igGetCursorStartPos", "ov_cimguiname": "igGetCursorStartPos",
"ret": "ImVec2", "ret": "void",
"signature": "()", "signature": "()",
"stname": "" "stname": ""
} }
@@ -9151,16 +9211,22 @@
], ],
"igGetFontTexUvWhitePixel": [ "igGetFontTexUvWhitePixel": [
{ {
"args": "()", "args": "(ImVec2 *pOut)",
"argsT": [], "argsT": [
{
"name": "pOut",
"type": "ImVec2*"
}
],
"argsoriginal": "()", "argsoriginal": "()",
"call_args": "()", "call_args": "()",
"cimguiname": "igGetFontTexUvWhitePixel", "cimguiname": "igGetFontTexUvWhitePixel",
"defaults": [], "defaults": [],
"funcname": "GetFontTexUvWhitePixel", "funcname": "GetFontTexUvWhitePixel",
"namespace": "ImGui", "namespace": "ImGui",
"nonUDT": 1,
"ov_cimguiname": "igGetFontTexUvWhitePixel", "ov_cimguiname": "igGetFontTexUvWhitePixel",
"ret": "ImVec2", "ret": "void",
"signature": "()", "signature": "()",
"stname": "" "stname": ""
} }
@@ -9311,48 +9377,66 @@
], ],
"igGetItemRectMax": [ "igGetItemRectMax": [
{ {
"args": "()", "args": "(ImVec2 *pOut)",
"argsT": [], "argsT": [
{
"name": "pOut",
"type": "ImVec2*"
}
],
"argsoriginal": "()", "argsoriginal": "()",
"call_args": "()", "call_args": "()",
"cimguiname": "igGetItemRectMax", "cimguiname": "igGetItemRectMax",
"defaults": [], "defaults": [],
"funcname": "GetItemRectMax", "funcname": "GetItemRectMax",
"namespace": "ImGui", "namespace": "ImGui",
"nonUDT": 1,
"ov_cimguiname": "igGetItemRectMax", "ov_cimguiname": "igGetItemRectMax",
"ret": "ImVec2", "ret": "void",
"signature": "()", "signature": "()",
"stname": "" "stname": ""
} }
], ],
"igGetItemRectMin": [ "igGetItemRectMin": [
{ {
"args": "()", "args": "(ImVec2 *pOut)",
"argsT": [], "argsT": [
{
"name": "pOut",
"type": "ImVec2*"
}
],
"argsoriginal": "()", "argsoriginal": "()",
"call_args": "()", "call_args": "()",
"cimguiname": "igGetItemRectMin", "cimguiname": "igGetItemRectMin",
"defaults": [], "defaults": [],
"funcname": "GetItemRectMin", "funcname": "GetItemRectMin",
"namespace": "ImGui", "namespace": "ImGui",
"nonUDT": 1,
"ov_cimguiname": "igGetItemRectMin", "ov_cimguiname": "igGetItemRectMin",
"ret": "ImVec2", "ret": "void",
"signature": "()", "signature": "()",
"stname": "" "stname": ""
} }
], ],
"igGetItemRectSize": [ "igGetItemRectSize": [
{ {
"args": "()", "args": "(ImVec2 *pOut)",
"argsT": [], "argsT": [
{
"name": "pOut",
"type": "ImVec2*"
}
],
"argsoriginal": "()", "argsoriginal": "()",
"call_args": "()", "call_args": "()",
"cimguiname": "igGetItemRectSize", "cimguiname": "igGetItemRectSize",
"defaults": [], "defaults": [],
"funcname": "GetItemRectSize", "funcname": "GetItemRectSize",
"namespace": "ImGui", "namespace": "ImGui",
"nonUDT": 1,
"ov_cimguiname": "igGetItemRectSize", "ov_cimguiname": "igGetItemRectSize",
"ret": "ImVec2", "ret": "void",
"signature": "()", "signature": "()",
"stname": "" "stname": ""
} }
@@ -9425,8 +9509,12 @@
], ],
"igGetMouseDragDelta": [ "igGetMouseDragDelta": [
{ {
"args": "(ImGuiMouseButton button,float lock_threshold)", "args": "(ImVec2 *pOut,ImGuiMouseButton button,float lock_threshold)",
"argsT": [ "argsT": [
{
"name": "pOut",
"type": "ImVec2*"
},
{ {
"name": "button", "name": "button",
"type": "ImGuiMouseButton" "type": "ImGuiMouseButton"
@@ -9445,40 +9533,53 @@
}, },
"funcname": "GetMouseDragDelta", "funcname": "GetMouseDragDelta",
"namespace": "ImGui", "namespace": "ImGui",
"nonUDT": 1,
"ov_cimguiname": "igGetMouseDragDelta", "ov_cimguiname": "igGetMouseDragDelta",
"ret": "ImVec2", "ret": "void",
"signature": "(ImGuiMouseButton,float)", "signature": "(ImGuiMouseButton,float)",
"stname": "" "stname": ""
} }
], ],
"igGetMousePos": [ "igGetMousePos": [
{ {
"args": "()", "args": "(ImVec2 *pOut)",
"argsT": [], "argsT": [
{
"name": "pOut",
"type": "ImVec2*"
}
],
"argsoriginal": "()", "argsoriginal": "()",
"call_args": "()", "call_args": "()",
"cimguiname": "igGetMousePos", "cimguiname": "igGetMousePos",
"defaults": [], "defaults": [],
"funcname": "GetMousePos", "funcname": "GetMousePos",
"namespace": "ImGui", "namespace": "ImGui",
"nonUDT": 1,
"ov_cimguiname": "igGetMousePos", "ov_cimguiname": "igGetMousePos",
"ret": "ImVec2", "ret": "void",
"signature": "()", "signature": "()",
"stname": "" "stname": ""
} }
], ],
"igGetMousePosOnOpeningCurrentPopup": [ "igGetMousePosOnOpeningCurrentPopup": [
{ {
"args": "()", "args": "(ImVec2 *pOut)",
"argsT": [], "argsT": [
{
"name": "pOut",
"type": "ImVec2*"
}
],
"argsoriginal": "()", "argsoriginal": "()",
"call_args": "()", "call_args": "()",
"cimguiname": "igGetMousePosOnOpeningCurrentPopup", "cimguiname": "igGetMousePosOnOpeningCurrentPopup",
"defaults": [], "defaults": [],
"funcname": "GetMousePosOnOpeningCurrentPopup", "funcname": "GetMousePosOnOpeningCurrentPopup",
"namespace": "ImGui", "namespace": "ImGui",
"nonUDT": 1,
"ov_cimguiname": "igGetMousePosOnOpeningCurrentPopup", "ov_cimguiname": "igGetMousePosOnOpeningCurrentPopup",
"ret": "ImVec2", "ret": "void",
"signature": "()", "signature": "()",
"stname": "" "stname": ""
} }
@@ -9705,32 +9806,44 @@
], ],
"igGetWindowContentRegionMax": [ "igGetWindowContentRegionMax": [
{ {
"args": "()", "args": "(ImVec2 *pOut)",
"argsT": [], "argsT": [
{
"name": "pOut",
"type": "ImVec2*"
}
],
"argsoriginal": "()", "argsoriginal": "()",
"call_args": "()", "call_args": "()",
"cimguiname": "igGetWindowContentRegionMax", "cimguiname": "igGetWindowContentRegionMax",
"defaults": [], "defaults": [],
"funcname": "GetWindowContentRegionMax", "funcname": "GetWindowContentRegionMax",
"namespace": "ImGui", "namespace": "ImGui",
"nonUDT": 1,
"ov_cimguiname": "igGetWindowContentRegionMax", "ov_cimguiname": "igGetWindowContentRegionMax",
"ret": "ImVec2", "ret": "void",
"signature": "()", "signature": "()",
"stname": "" "stname": ""
} }
], ],
"igGetWindowContentRegionMin": [ "igGetWindowContentRegionMin": [
{ {
"args": "()", "args": "(ImVec2 *pOut)",
"argsT": [], "argsT": [
{
"name": "pOut",
"type": "ImVec2*"
}
],
"argsoriginal": "()", "argsoriginal": "()",
"call_args": "()", "call_args": "()",
"cimguiname": "igGetWindowContentRegionMin", "cimguiname": "igGetWindowContentRegionMin",
"defaults": [], "defaults": [],
"funcname": "GetWindowContentRegionMin", "funcname": "GetWindowContentRegionMin",
"namespace": "ImGui", "namespace": "ImGui",
"nonUDT": 1,
"ov_cimguiname": "igGetWindowContentRegionMin", "ov_cimguiname": "igGetWindowContentRegionMin",
"ret": "ImVec2", "ret": "void",
"signature": "()", "signature": "()",
"stname": "" "stname": ""
} }
@@ -9785,32 +9898,44 @@
], ],
"igGetWindowPos": [ "igGetWindowPos": [
{ {
"args": "()", "args": "(ImVec2 *pOut)",
"argsT": [], "argsT": [
{
"name": "pOut",
"type": "ImVec2*"
}
],
"argsoriginal": "()", "argsoriginal": "()",
"call_args": "()", "call_args": "()",
"cimguiname": "igGetWindowPos", "cimguiname": "igGetWindowPos",
"defaults": [], "defaults": [],
"funcname": "GetWindowPos", "funcname": "GetWindowPos",
"namespace": "ImGui", "namespace": "ImGui",
"nonUDT": 1,
"ov_cimguiname": "igGetWindowPos", "ov_cimguiname": "igGetWindowPos",
"ret": "ImVec2", "ret": "void",
"signature": "()", "signature": "()",
"stname": "" "stname": ""
} }
], ],
"igGetWindowSize": [ "igGetWindowSize": [
{ {
"args": "()", "args": "(ImVec2 *pOut)",
"argsT": [], "argsT": [
{
"name": "pOut",
"type": "ImVec2*"
}
],
"argsoriginal": "()", "argsoriginal": "()",
"call_args": "()", "call_args": "()",
"cimguiname": "igGetWindowSize", "cimguiname": "igGetWindowSize",
"defaults": [], "defaults": [],
"funcname": "GetWindowSize", "funcname": "GetWindowSize",
"namespace": "ImGui", "namespace": "ImGui",
"nonUDT": 1,
"ov_cimguiname": "igGetWindowSize", "ov_cimguiname": "igGetWindowSize",
"ret": "ImVec2", "ret": "void",
"signature": "()", "signature": "()",
"stname": "" "stname": ""
} }

699
generator/output/definitions.lua
View File

File diff suppressed because it is too large Load Diff