Merge branch 'docking_inter'

This commit is contained in:
sonoro1234
2022-01-31 19:14:58 +01:00
9 changed files with 658 additions and 317 deletions

View File

@@ -1,7 +1,7 @@
typedef struct SDL_Window SDL_Window;
typedef struct GLFWmonitor GLFWmonitor;
typedef struct GLFWwindow GLFWwindow;
typedef struct GLFWwindow GLFWwindow;
typedef struct GLFWmonitor GLFWmonitor;
typedef struct SDL_Window SDL_Window;
struct GLFWwindow;
struct GLFWmonitor;

View File

@@ -551,7 +551,7 @@
],
"ImChunkStream_swap": [
{
"args": "(ImChunkStream* self,ImChunkStream* rhs)",
"args": "(ImChunkStream* self,ImChunkStream_T * rhs)",
"argsT": [
{
"name": "self",
@@ -560,7 +560,7 @@
{
"name": "rhs",
"reftoptr": true,
"type": "ImChunkStream*"
"type": "ImChunkStream_T *"
}
],
"argsoriginal": "(ImChunkStream<T>& rhs)",
@@ -571,7 +571,7 @@
"location": "imgui_internal:675",
"ov_cimguiname": "ImChunkStream_swap",
"ret": "void",
"signature": "(ImChunkStream*)",
"signature": "(ImChunkStream_T *)",
"stname": "ImChunkStream",
"templated": true
}
@@ -11148,11 +11148,11 @@
"templated": true
},
{
"args": "(const ImVector src)",
"args": "(const ImVector_T src)",
"argsT": [
{
"name": "src",
"type": "const ImVector"
"type": "const ImVector_T "
}
],
"argsoriginal": "(const ImVector<T>& src)",
@@ -11162,8 +11162,8 @@
"defaults": {},
"funcname": "ImVector",
"location": "imgui:1708",
"ov_cimguiname": "ImVector_ImVector_Vector",
"signature": "(const ImVector)",
"ov_cimguiname": "ImVector_ImVector_Vector_T_",
"signature": "(const ImVector_T )",
"stname": "ImVector",
"templated": true
}
@@ -12010,7 +12010,7 @@
],
"ImVector_swap": [
{
"args": "(ImVector* self,ImVector* rhs)",
"args": "(ImVector* self,ImVector_T * rhs)",
"argsT": [
{
"name": "self",
@@ -12019,7 +12019,7 @@
{
"name": "rhs",
"reftoptr": true,
"type": "ImVector*"
"type": "ImVector_T *"
}
],
"argsoriginal": "(ImVector<T>& rhs)",
@@ -12030,7 +12030,7 @@
"location": "imgui:1732",
"ov_cimguiname": "ImVector_swap",
"ret": "void",
"signature": "(ImVector*)",
"signature": "(ImVector_T *)",
"stname": "ImVector",
"templated": true
}
@@ -20612,7 +20612,7 @@
"cimguiname": "igImRsqrt",
"defaults": {},
"funcname": "ImRsqrt",
"location": "imgui_internal:417",
"location": "imgui_internal:419",
"ov_cimguiname": "igImRsqrt_Float",
"ret": "float",
"signature": "(float)",

View File

@@ -470,7 +470,7 @@ defs["ImChunkStream_size"][1]["templated"] = true
defs["ImChunkStream_size"]["()const"] = defs["ImChunkStream_size"][1]
defs["ImChunkStream_swap"] = {}
defs["ImChunkStream_swap"][1] = {}
defs["ImChunkStream_swap"][1]["args"] = "(ImChunkStream* self,ImChunkStream* rhs)"
defs["ImChunkStream_swap"][1]["args"] = "(ImChunkStream* self,ImChunkStream_T * rhs)"
defs["ImChunkStream_swap"][1]["argsT"] = {}
defs["ImChunkStream_swap"][1]["argsT"][1] = {}
defs["ImChunkStream_swap"][1]["argsT"][1]["name"] = "self"
@@ -478,7 +478,7 @@ defs["ImChunkStream_swap"][1]["argsT"][1]["type"] = "ImChunkStream*"
defs["ImChunkStream_swap"][1]["argsT"][2] = {}
defs["ImChunkStream_swap"][1]["argsT"][2]["name"] = "rhs"
defs["ImChunkStream_swap"][1]["argsT"][2]["reftoptr"] = true
defs["ImChunkStream_swap"][1]["argsT"][2]["type"] = "ImChunkStream*"
defs["ImChunkStream_swap"][1]["argsT"][2]["type"] = "ImChunkStream_T *"
defs["ImChunkStream_swap"][1]["argsoriginal"] = "(ImChunkStream<T>& rhs)"
defs["ImChunkStream_swap"][1]["call_args"] = "(*rhs)"
defs["ImChunkStream_swap"][1]["cimguiname"] = "ImChunkStream_swap"
@@ -487,10 +487,10 @@ defs["ImChunkStream_swap"][1]["funcname"] = "swap"
defs["ImChunkStream_swap"][1]["location"] = "imgui_internal:675"
defs["ImChunkStream_swap"][1]["ov_cimguiname"] = "ImChunkStream_swap"
defs["ImChunkStream_swap"][1]["ret"] = "void"
defs["ImChunkStream_swap"][1]["signature"] = "(ImChunkStream*)"
defs["ImChunkStream_swap"][1]["signature"] = "(ImChunkStream_T *)"
defs["ImChunkStream_swap"][1]["stname"] = "ImChunkStream"
defs["ImChunkStream_swap"][1]["templated"] = true
defs["ImChunkStream_swap"]["(ImChunkStream*)"] = defs["ImChunkStream_swap"][1]
defs["ImChunkStream_swap"]["(ImChunkStream_T *)"] = defs["ImChunkStream_swap"][1]
defs["ImColor_HSV"] = {}
defs["ImColor_HSV"][1] = {}
defs["ImColor_HSV"][1]["args"] = "(ImColor *pOut,float h,float s,float v,float a)"
@@ -9409,11 +9409,11 @@ defs["ImVector_ImVector"][1]["signature"] = "()"
defs["ImVector_ImVector"][1]["stname"] = "ImVector"
defs["ImVector_ImVector"][1]["templated"] = true
defs["ImVector_ImVector"][2] = {}
defs["ImVector_ImVector"][2]["args"] = "(const ImVector src)"
defs["ImVector_ImVector"][2]["args"] = "(const ImVector_T src)"
defs["ImVector_ImVector"][2]["argsT"] = {}
defs["ImVector_ImVector"][2]["argsT"][1] = {}
defs["ImVector_ImVector"][2]["argsT"][1]["name"] = "src"
defs["ImVector_ImVector"][2]["argsT"][1]["type"] = "const ImVector"
defs["ImVector_ImVector"][2]["argsT"][1]["type"] = "const ImVector_T "
defs["ImVector_ImVector"][2]["argsoriginal"] = "(const ImVector<T>& src)"
defs["ImVector_ImVector"][2]["call_args"] = "(src)"
defs["ImVector_ImVector"][2]["cimguiname"] = "ImVector_ImVector"
@@ -9421,12 +9421,12 @@ defs["ImVector_ImVector"][2]["constructor"] = true
defs["ImVector_ImVector"][2]["defaults"] = {}
defs["ImVector_ImVector"][2]["funcname"] = "ImVector"
defs["ImVector_ImVector"][2]["location"] = "imgui:1708"
defs["ImVector_ImVector"][2]["ov_cimguiname"] = "ImVector_ImVector_Vector"
defs["ImVector_ImVector"][2]["signature"] = "(const ImVector)"
defs["ImVector_ImVector"][2]["ov_cimguiname"] = "ImVector_ImVector_Vector_T_"
defs["ImVector_ImVector"][2]["signature"] = "(const ImVector_T )"
defs["ImVector_ImVector"][2]["stname"] = "ImVector"
defs["ImVector_ImVector"][2]["templated"] = true
defs["ImVector_ImVector"]["()"] = defs["ImVector_ImVector"][1]
defs["ImVector_ImVector"]["(const ImVector)"] = defs["ImVector_ImVector"][2]
defs["ImVector_ImVector"]["(const ImVector_T )"] = defs["ImVector_ImVector"][2]
defs["ImVector__grow_capacity"] = {}
defs["ImVector__grow_capacity"][1] = {}
defs["ImVector__grow_capacity"][1]["args"] = "(ImVector* self,int sz)"
@@ -10151,7 +10151,7 @@ defs["ImVector_size_in_bytes"][1]["templated"] = true
defs["ImVector_size_in_bytes"]["()const"] = defs["ImVector_size_in_bytes"][1]
defs["ImVector_swap"] = {}
defs["ImVector_swap"][1] = {}
defs["ImVector_swap"][1]["args"] = "(ImVector* self,ImVector* rhs)"
defs["ImVector_swap"][1]["args"] = "(ImVector* self,ImVector_T * rhs)"
defs["ImVector_swap"][1]["argsT"] = {}
defs["ImVector_swap"][1]["argsT"][1] = {}
defs["ImVector_swap"][1]["argsT"][1]["name"] = "self"
@@ -10159,7 +10159,7 @@ defs["ImVector_swap"][1]["argsT"][1]["type"] = "ImVector*"
defs["ImVector_swap"][1]["argsT"][2] = {}
defs["ImVector_swap"][1]["argsT"][2]["name"] = "rhs"
defs["ImVector_swap"][1]["argsT"][2]["reftoptr"] = true
defs["ImVector_swap"][1]["argsT"][2]["type"] = "ImVector*"
defs["ImVector_swap"][1]["argsT"][2]["type"] = "ImVector_T *"
defs["ImVector_swap"][1]["argsoriginal"] = "(ImVector<T>& rhs)"
defs["ImVector_swap"][1]["call_args"] = "(*rhs)"
defs["ImVector_swap"][1]["cimguiname"] = "ImVector_swap"
@@ -10168,10 +10168,10 @@ defs["ImVector_swap"][1]["funcname"] = "swap"
defs["ImVector_swap"][1]["location"] = "imgui:1732"
defs["ImVector_swap"][1]["ov_cimguiname"] = "ImVector_swap"
defs["ImVector_swap"][1]["ret"] = "void"
defs["ImVector_swap"][1]["signature"] = "(ImVector*)"
defs["ImVector_swap"][1]["signature"] = "(ImVector_T *)"
defs["ImVector_swap"][1]["stname"] = "ImVector"
defs["ImVector_swap"][1]["templated"] = true
defs["ImVector_swap"]["(ImVector*)"] = defs["ImVector_swap"][1]
defs["ImVector_swap"]["(ImVector_T *)"] = defs["ImVector_swap"][1]
defs["igAcceptDragDropPayload"] = {}
defs["igAcceptDragDropPayload"][1] = {}
defs["igAcceptDragDropPayload"][1]["args"] = "(const char* type,ImGuiDragDropFlags flags)"
@@ -17483,7 +17483,7 @@ defs["igImRsqrt"][1]["call_args"] = "(x)"
defs["igImRsqrt"][1]["cimguiname"] = "igImRsqrt"
defs["igImRsqrt"][1]["defaults"] = {}
defs["igImRsqrt"][1]["funcname"] = "ImRsqrt"
defs["igImRsqrt"][1]["location"] = "imgui_internal:417"
defs["igImRsqrt"][1]["location"] = "imgui_internal:419"
defs["igImRsqrt"][1]["ov_cimguiname"] = "igImRsqrt_Float"
defs["igImRsqrt"][1]["ret"] = "float"
defs["igImRsqrt"][1]["signature"] = "(float)"

View File

@@ -75,7 +75,7 @@ ImVec4_ImVec4 2
2 nil ImVec4_ImVec4_Float (float,float,float,float)
ImVector_ImVector 2
1 nil ImVector_ImVector_Nil ()
2 nil ImVector_ImVector_Vector (const ImVector)
2 nil ImVector_ImVector_Vector_T_ (const ImVector_T )
ImVector_back 2
1 T* ImVector_back_Nil ()
2 const T* ImVector_back__const ()const

View File

@@ -6171,5 +6171,122 @@ defs["structs"]["StbUndoState"][5]["type"] = "int"
defs["structs"]["StbUndoState"][6] = {}
defs["structs"]["StbUndoState"][6]["name"] = "redo_char_point"
defs["structs"]["StbUndoState"][6]["type"] = "int"
defs["templated_structs"] = {}
defs["templated_structs"]["ImBitArray"] = {}
defs["templated_structs"]["ImBitArray"][1] = {}
defs["templated_structs"]["ImBitArray"][1]["name"] = "Storage[(BITCOUNT+31)>>5]"
defs["templated_structs"]["ImBitArray"][1]["type"] = "ImU32"
defs["templated_structs"]["ImChunkStream"] = {}
defs["templated_structs"]["ImChunkStream"][1] = {}
defs["templated_structs"]["ImChunkStream"][1]["name"] = "Buf"
defs["templated_structs"]["ImChunkStream"][1]["template_type"] = "char"
defs["templated_structs"]["ImChunkStream"][1]["type"] = "ImVector_char"
defs["templated_structs"]["ImPool"] = {}
defs["templated_structs"]["ImPool"][1] = {}
defs["templated_structs"]["ImPool"][1]["name"] = "Buf"
defs["templated_structs"]["ImPool"][1]["type"] = "ImVector<T>"
defs["templated_structs"]["ImPool"][2] = {}
defs["templated_structs"]["ImPool"][2]["name"] = "Map"
defs["templated_structs"]["ImPool"][2]["type"] = "ImGuiStorage"
defs["templated_structs"]["ImPool"][3] = {}
defs["templated_structs"]["ImPool"][3]["name"] = "FreeIdx"
defs["templated_structs"]["ImPool"][3]["type"] = "ImPoolIdx"
defs["templated_structs"]["ImPool"][4] = {}
defs["templated_structs"]["ImPool"][4]["name"] = "AliveCount"
defs["templated_structs"]["ImPool"][4]["type"] = "ImPoolIdx"
defs["templated_structs"]["ImSpan"] = {}
defs["templated_structs"]["ImSpan"][1] = {}
defs["templated_structs"]["ImSpan"][1]["name"] = "Data"
defs["templated_structs"]["ImSpan"][1]["type"] = "T*"
defs["templated_structs"]["ImSpan"][2] = {}
defs["templated_structs"]["ImSpan"][2]["name"] = "DataEnd"
defs["templated_structs"]["ImSpan"][2]["type"] = "T*"
defs["templated_structs"]["ImSpanAllocator"] = {}
defs["templated_structs"]["ImSpanAllocator"][1] = {}
defs["templated_structs"]["ImSpanAllocator"][1]["name"] = "BasePtr"
defs["templated_structs"]["ImSpanAllocator"][1]["type"] = "char*"
defs["templated_structs"]["ImSpanAllocator"][2] = {}
defs["templated_structs"]["ImSpanAllocator"][2]["name"] = "CurrOff"
defs["templated_structs"]["ImSpanAllocator"][2]["type"] = "int"
defs["templated_structs"]["ImSpanAllocator"][3] = {}
defs["templated_structs"]["ImSpanAllocator"][3]["name"] = "CurrIdx"
defs["templated_structs"]["ImSpanAllocator"][3]["type"] = "int"
defs["templated_structs"]["ImSpanAllocator"][4] = {}
defs["templated_structs"]["ImSpanAllocator"][4]["name"] = "Offsets[CHUNKS]"
defs["templated_structs"]["ImSpanAllocator"][4]["type"] = "int"
defs["templated_structs"]["ImSpanAllocator"][5] = {}
defs["templated_structs"]["ImSpanAllocator"][5]["name"] = "Sizes[CHUNKS]"
defs["templated_structs"]["ImSpanAllocator"][5]["type"] = "int"
defs["templated_structs"]["ImVector"] = {}
defs["templated_structs"]["ImVector"][1] = {}
defs["templated_structs"]["ImVector"][1]["name"] = "Size"
defs["templated_structs"]["ImVector"][1]["type"] = "int"
defs["templated_structs"]["ImVector"][2] = {}
defs["templated_structs"]["ImVector"][2]["name"] = "Capacity"
defs["templated_structs"]["ImVector"][2]["type"] = "int"
defs["templated_structs"]["ImVector"][3] = {}
defs["templated_structs"]["ImVector"][3]["name"] = "Data"
defs["templated_structs"]["ImVector"][3]["type"] = "T*"
defs["templates_done"] = {}
defs["templates_done"]["ImChunkStream"] = {}
defs["templates_done"]["ImChunkStream"]["ImGuiTableSettings"] = true
defs["templates_done"]["ImChunkStream"]["ImGuiWindowSettings"] = true
defs["templates_done"]["ImPool"] = {}
defs["templates_done"]["ImPool"]["ImGuiTabBar"] = true
defs["templates_done"]["ImPool"]["ImGuiTable"] = true
defs["templates_done"]["ImSpan"] = {}
defs["templates_done"]["ImSpan"]["ImGuiTableCellData"] = true
defs["templates_done"]["ImSpan"]["ImGuiTableColumn"] = true
defs["templates_done"]["ImSpan"]["ImGuiTableColumnIdx"] = true
defs["templates_done"]["ImVector"] = {}
defs["templates_done"]["ImVector"]["ImDrawChannel"] = true
defs["templates_done"]["ImVector"]["ImDrawCmd"] = true
defs["templates_done"]["ImVector"]["ImDrawIdx"] = true
defs["templates_done"]["ImVector"]["ImDrawList*"] = true
defs["templates_done"]["ImVector"]["ImDrawVert"] = true
defs["templates_done"]["ImVector"]["ImFont*"] = true
defs["templates_done"]["ImVector"]["ImFontAtlasCustomRect"] = true
defs["templates_done"]["ImVector"]["ImFontConfig"] = true
defs["templates_done"]["ImVector"]["ImFontGlyph"] = true
defs["templates_done"]["ImVector"]["ImGuiColorMod"] = true
defs["templates_done"]["ImVector"]["ImGuiContextHook"] = true
defs["templates_done"]["ImVector"]["ImGuiGroupData"] = true
defs["templates_done"]["ImVector"]["ImGuiID"] = true
defs["templates_done"]["ImVector"]["ImGuiItemFlags"] = true
defs["templates_done"]["ImVector"]["ImGuiListClipperData"] = true
defs["templates_done"]["ImVector"]["ImGuiListClipperRange"] = true
defs["templates_done"]["ImVector"]["ImGuiOldColumnData"] = true
defs["templates_done"]["ImVector"]["ImGuiOldColumns"] = true
defs["templates_done"]["ImVector"]["ImGuiPopupData"] = true
defs["templates_done"]["ImVector"]["ImGuiPtrOrIndex"] = true
defs["templates_done"]["ImVector"]["ImGuiSettingsHandler"] = true
defs["templates_done"]["ImVector"]["ImGuiShrinkWidthItem"] = true
defs["templates_done"]["ImVector"]["ImGuiStackLevelInfo"] = true
defs["templates_done"]["ImVector"]["ImGuiStoragePair"] = true
defs["templates_done"]["ImVector"]["ImGuiStyleMod"] = true
defs["templates_done"]["ImVector"]["ImGuiTabBar"] = true
defs["templates_done"]["ImVector"]["ImGuiTabItem"] = true
defs["templates_done"]["ImVector"]["ImGuiTable"] = true
defs["templates_done"]["ImVector"]["ImGuiTableColumnSortSpecs"] = true
defs["templates_done"]["ImVector"]["ImGuiTableTempData"] = true
defs["templates_done"]["ImVector"]["ImGuiTextRange"] = true
defs["templates_done"]["ImVector"]["ImGuiViewportP*"] = true
defs["templates_done"]["ImVector"]["ImGuiWindow*"] = true
defs["templates_done"]["ImVector"]["ImGuiWindowStackData"] = true
defs["templates_done"]["ImVector"]["ImTextureID"] = true
defs["templates_done"]["ImVector"]["ImU32"] = true
defs["templates_done"]["ImVector"]["ImVec2"] = true
defs["templates_done"]["ImVector"]["ImVec4"] = true
defs["templates_done"]["ImVector"]["ImWchar"] = true
defs["templates_done"]["ImVector"]["char"] = true
defs["templates_done"]["ImVector"]["float"] = true
defs["templates_done"]["ImVector"]["unsigned char"] = true
defs["typenames"] = {}
defs["typenames"]["ImBitArray"] = "int BITCOUNT"
defs["typenames"]["ImChunkStream"] = "T"
defs["typenames"]["ImPool"] = "T"
defs["typenames"]["ImSpan"] = "T"
defs["typenames"]["ImSpanAllocator"] = "int CHUNKS"
defs["typenames"]["ImVector"] = "T"
return defs