Compare commits

...

21 Commits

Author SHA1 Message Date
Victor Bombi
ccdae842e4 pull imgui docking 1.82 and generate 2021-03-16 12:45:48 +01:00
Victor Bombi
c22606a7f0 test and backend_test/main.c changes for compiling with ImStrv 2021-03-04 13:30:37 +01:00
Victor Bombi
6552b43aae cpp2ffi: ImStr -> ImStrv 2021-03-04 13:30:37 +01:00
Victor Bombi
3d4277be4d CMakeLists: win32 add imm32 library 2021-03-04 13:30:37 +01:00
Victor Bombi
13aac22a35 cpp2ffi: allow function typedefs (not only function pointer typedefs) 2021-03-04 12:44:49 +01:00
Victor Bombi
aa0baa777c Makefile: add imgui_tables.cpp 2021-03-01 20:16:56 +01:00
Victor Bombi
41b397020a readme update 2021-02-11 14:50:09 +01:00
Victor Bombi
c1890d4c00 pull imgui docking 1.81 2021-02-11 10:32:01 +01:00
Victor Bombi
7756c4f53f pull imgui docking 1.81 and generate 2021-02-11 10:31:31 +01:00
Victor Bombi
2638737f2c cpp2ffi: parse_enum_value drop outer () (ImGuizmo needed it) 2021-02-05 18:04:22 +01:00
Victor Bombi
6aa3f1decd cpp2ffi: const char* versions of ImStr take now a postfix _Strv 2021-02-05 16:06:10 +01:00
Victor Bombi
bc708a092d cpp2ffi: char* -> Str, ImStr -> STR for backward compability 2021-02-05 16:06:10 +01:00
Victor Bombi
9ac7cd93e1 test, backend_test adapt to new naming 2021-02-05 16:06:10 +01:00
Victor Bombi
2838c0317a cpp2ffi: changes for name prefixing the const char* versions of ImStr 2021-02-05 16:06:09 +01:00
Victor Bombi
c57efd953f cpp2ffi: dont expect const ImStr 2021-02-05 16:06:09 +01:00
Victor Bombi
a48009b062 test and backend_test modifications for IMGUI_HAS_IMSTR 2021-02-05 16:06:09 +01:00
Victor Bombi
383ebf3a7a cpp2ffi: ADDiMSTR_S before overload naming and copy defaults, overload_Algo improvement 2021-02-05 16:06:09 +01:00
Victor Bombi
afdbb6b799 test and backend_test prepared for IMGUI_HAS_IMSTR 2021-02-05 16:06:09 +01:00
Victor Bombi
a64de2e303 cpp2ffi: add ADDIMSTR_S function for making const char* versions of ImStr arguments 2021-02-05 16:06:09 +01:00
Victor Bombi
a9928295db generator: keep IMGUI_HAS_IMSTR definition 2021-02-05 16:06:09 +01:00
Victor Bombi
ce239ed53f cpp2ffi: overload naming char* -> Chpt (was Str) avoids clash with ImStr - > Str 2021-02-05 16:06:09 +01:00
20 changed files with 5227 additions and 4163 deletions

View File

@@ -40,6 +40,7 @@ endif (IMGUI_STATIC)
target_compile_definitions(cimgui PUBLIC IMGUI_DISABLE_OBSOLETE_FUNCTIONS=1) target_compile_definitions(cimgui PUBLIC IMGUI_DISABLE_OBSOLETE_FUNCTIONS=1)
if (WIN32) if (WIN32)
target_compile_definitions(cimgui PUBLIC IMGUI_IMPL_API=extern\t\"C\"\t__declspec\(dllexport\)) target_compile_definitions(cimgui PUBLIC IMGUI_IMPL_API=extern\t\"C\"\t__declspec\(dllexport\))
list(APPEND IMGUI_LIBRARIES imm32)
else (WIN32) else (WIN32)
target_compile_definitions(cimgui PUBLIC IMGUI_IMPL_API=extern\t\"C\"\t) target_compile_definitions(cimgui PUBLIC IMGUI_IMPL_API=extern\t\"C\"\t)
endif (WIN32) endif (WIN32)

View File

@@ -6,6 +6,7 @@ OBJS = cimgui.o
OBJS += ./imgui/imgui.o OBJS += ./imgui/imgui.o
OBJS += ./imgui/imgui_draw.o OBJS += ./imgui/imgui_draw.o
OBJS += ./imgui/imgui_demo.o OBJS += ./imgui/imgui_demo.o
OBJS += ./imgui/imgui_tables.o
OBJS += ./imgui/imgui_widgets.o OBJS += ./imgui/imgui_widgets.o
CXXFLAGS=-O2 -fno-exceptions -fno-rtti CXXFLAGS=-O2 -fno-exceptions -fno-rtti

View File

@@ -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) 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: Notes:
* currently this wrapper is based on version [1.80 of Dear ImGui with internal api] * currently this wrapper is based on version [1.82 of Dear ImGui with internal api]
* only functions, structs and enums from imgui.h (an optionally imgui_internal.h) are wrapped. * only functions, structs and enums from imgui.h (an optionally imgui_internal.h) are wrapped.
* if you are interested in imgui backends you should look [LuaJIT-ImGui](https://github.com/sonoro1234/LuaJIT-ImGui) project. * if you are interested in imgui backends you should look [LuaJIT-ImGui](https://github.com/sonoro1234/LuaJIT-ImGui) project.
* All naming is algorithmic except for those names that were coded in cimgui_overloads table (https://github.com/cimgui/cimgui/blob/master/generator/generator.lua#L60). In the official version this table is empty. * All naming is algorithmic except for those names that were coded in cimgui_overloads table (https://github.com/cimgui/cimgui/blob/master/generator/generator.lua#L60). In the official version this table is empty.

View File

@@ -11,7 +11,13 @@
#include <GL/gl.h> #include <GL/gl.h>
#include <GL/glu.h> #include <GL/glu.h>
#ifdef IMGUI_HAS_IMSTR
#define igBegin igBegin_Strv
#define igSliderFloat igSliderFloat_Strv
#define igCheckbox igCheckbox_Strv
#define igColorEdit3 igColorEdit3_Strv
#define igButton igButton_Strv
#endif
SDL_Window *window = NULL; SDL_Window *window = NULL;

View File

@@ -1,5 +1,5 @@
//This file is automatically generated by generator.lua from https://github.com/cimgui/cimgui //This file is automatically generated by generator.lua from https://github.com/cimgui/cimgui
//based on imgui.h file version "1.80" from Dear ImGui https://github.com/ocornut/imgui //based on imgui.h file version "1.82" from Dear ImGui https://github.com/ocornut/imgui
//with imgui_internal.h api //with imgui_internal.h api
//docking branch //docking branch
@@ -164,10 +164,6 @@ CIMGUI_API float igGetWindowDpiScale()
{ {
return ImGui::GetWindowDpiScale(); return ImGui::GetWindowDpiScale();
} }
CIMGUI_API ImGuiViewport* igGetWindowViewport()
{
return ImGui::GetWindowViewport();
}
CIMGUI_API void igGetWindowPos(ImVec2 *pOut) CIMGUI_API void igGetWindowPos(ImVec2 *pOut)
{ {
*pOut = ImGui::GetWindowPos(); *pOut = ImGui::GetWindowPos();
@@ -184,6 +180,10 @@ CIMGUI_API float igGetWindowHeight()
{ {
return ImGui::GetWindowHeight(); return ImGui::GetWindowHeight();
} }
CIMGUI_API ImGuiViewport* igGetWindowViewport()
{
return ImGui::GetWindowViewport();
}
CIMGUI_API void igSetNextWindowPos(const ImVec2 pos,ImGuiCond cond,const ImVec2 pivot) CIMGUI_API void igSetNextWindowPos(const ImVec2 pos,ImGuiCond cond,const ImVec2 pivot)
{ {
return ImGui::SetNextWindowPos(pos,cond,pivot); return ImGui::SetNextWindowPos(pos,cond,pivot);
@@ -954,6 +954,14 @@ CIMGUI_API bool igSelectableBoolPtr(const char* label,bool* p_selected,ImGuiSele
{ {
return ImGui::Selectable(label,p_selected,flags,size); return ImGui::Selectable(label,p_selected,flags,size);
} }
CIMGUI_API bool igBeginListBox(const char* label,const ImVec2 size)
{
return ImGui::BeginListBox(label,size);
}
CIMGUI_API void igEndListBox()
{
return ImGui::EndListBox();
}
CIMGUI_API bool igListBoxStr_arr(const char* label,int* current_item,const char* const items[],int items_count,int height_in_items) CIMGUI_API bool igListBoxStr_arr(const char* label,int* current_item,const char* const items[],int items_count,int height_in_items)
{ {
return ImGui::ListBox(label,current_item,items,items_count,height_in_items); return ImGui::ListBox(label,current_item,items,items_count,height_in_items);
@@ -962,18 +970,6 @@ CIMGUI_API bool igListBoxFnBoolPtr(const char* label,int* current_item,bool(*ite
{ {
return ImGui::ListBox(label,current_item,items_getter,data,items_count,height_in_items); return ImGui::ListBox(label,current_item,items_getter,data,items_count,height_in_items);
} }
CIMGUI_API bool igListBoxHeaderVec2(const char* label,const ImVec2 size)
{
return ImGui::ListBoxHeader(label,size);
}
CIMGUI_API bool igListBoxHeaderInt(const char* label,int items_count,int height_in_items)
{
return ImGui::ListBoxHeader(label,items_count,height_in_items);
}
CIMGUI_API void igListBoxFooter()
{
return ImGui::ListBoxFooter();
}
CIMGUI_API void igPlotLinesFloatPtr(const char* label,const float* values,int values_count,int values_offset,const char* overlay_text,float scale_min,float scale_max,ImVec2 graph_size,int stride) CIMGUI_API void igPlotLinesFloatPtr(const char* label,const float* values,int values_count,int values_offset,const char* overlay_text,float scale_min,float scale_max,ImVec2 graph_size,int stride)
{ {
return ImGui::PlotLines(label,values,values_count,values_offset,overlay_text,scale_min,scale_max,graph_size,stride); return ImGui::PlotLines(label,values,values_count,values_offset,overlay_text,scale_min,scale_max,graph_size,stride);
@@ -1117,7 +1113,7 @@ CIMGUI_API bool igTableSetColumnIndex(int column_n)
{ {
return ImGui::TableSetColumnIndex(column_n); return ImGui::TableSetColumnIndex(column_n);
} }
CIMGUI_API void igTableSetupColumn(const char* label,ImGuiTableColumnFlags flags,float init_width_or_weight,ImU32 user_id) CIMGUI_API void igTableSetupColumn(const char* label,ImGuiTableColumnFlags flags,float init_width_or_weight,ImGuiID user_id)
{ {
return ImGui::TableSetupColumn(label,flags,init_width_or_weight,user_id); return ImGui::TableSetupColumn(label,flags,init_width_or_weight,user_id);
} }
@@ -1221,7 +1217,7 @@ CIMGUI_API void igDockSpace(ImGuiID id,const ImVec2 size,ImGuiDockNodeFlags flag
{ {
return ImGui::DockSpace(id,size,flags,window_class); return ImGui::DockSpace(id,size,flags,window_class);
} }
CIMGUI_API ImGuiID igDockSpaceOverViewport(ImGuiViewport* viewport,ImGuiDockNodeFlags flags,const ImGuiWindowClass* window_class) CIMGUI_API ImGuiID igDockSpaceOverViewport(const ImGuiViewport* viewport,ImGuiDockNodeFlags flags,const ImGuiWindowClass* window_class)
{ {
return ImGui::DockSpaceOverViewport(viewport,flags,window_class); return ImGui::DockSpaceOverViewport(viewport,flags,window_class);
} }
@@ -1261,6 +1257,10 @@ CIMGUI_API void igLogButtons()
{ {
return ImGui::LogButtons(); return ImGui::LogButtons();
} }
CIMGUI_API void igLogTextV(const char* fmt,va_list args)
{
return ImGui::LogTextV(fmt,args);
}
CIMGUI_API bool igBeginDragDropSource(ImGuiDragDropFlags flags) CIMGUI_API bool igBeginDragDropSource(ImGuiDragDropFlags flags)
{ {
return ImGui::BeginDragDropSource(flags); return ImGui::BeginDragDropSource(flags);
@@ -1373,6 +1373,10 @@ CIMGUI_API void igSetItemAllowOverlap()
{ {
return ImGui::SetItemAllowOverlap(); return ImGui::SetItemAllowOverlap();
} }
CIMGUI_API ImGuiViewport* igGetMainViewport()
{
return ImGui::GetMainViewport();
}
CIMGUI_API bool igIsRectVisibleNil(const ImVec2 size) CIMGUI_API bool igIsRectVisibleNil(const ImVec2 size)
{ {
return ImGui::IsRectVisible(size); return ImGui::IsRectVisible(size);
@@ -1565,10 +1569,14 @@ CIMGUI_API bool igDebugCheckVersionAndDataLayout(const char* version_str,size_t
{ {
return ImGui::DebugCheckVersionAndDataLayout(version_str,sz_io,sz_style,sz_vec2,sz_vec4,sz_drawvert,sz_drawidx); return ImGui::DebugCheckVersionAndDataLayout(version_str,sz_io,sz_style,sz_vec2,sz_vec4,sz_drawvert,sz_drawidx);
} }
CIMGUI_API void igSetAllocatorFunctions(void*(*alloc_func)(size_t sz,void* user_data),void(*free_func)(void* ptr,void* user_data),void* user_data) CIMGUI_API void igSetAllocatorFunctions(ImGuiMemAllocFunc alloc_func,ImGuiMemFreeFunc free_func,void* user_data)
{ {
return ImGui::SetAllocatorFunctions(alloc_func,free_func,user_data); return ImGui::SetAllocatorFunctions(alloc_func,free_func,user_data);
} }
CIMGUI_API void igGetAllocatorFunctions(ImGuiMemAllocFunc* p_alloc_func,ImGuiMemFreeFunc* p_free_func,void** p_user_data)
{
return ImGui::GetAllocatorFunctions(p_alloc_func,p_free_func,p_user_data);
}
CIMGUI_API void* igMemAlloc(size_t size) CIMGUI_API void* igMemAlloc(size_t size)
{ {
return ImGui::MemAlloc(size); return ImGui::MemAlloc(size);
@@ -1581,10 +1589,6 @@ CIMGUI_API ImGuiPlatformIO* igGetPlatformIO()
{ {
return &ImGui::GetPlatformIO(); return &ImGui::GetPlatformIO();
} }
CIMGUI_API ImGuiViewport* igGetMainViewport()
{
return ImGui::GetMainViewport();
}
CIMGUI_API void igUpdatePlatformWindows() CIMGUI_API void igUpdatePlatformWindows()
{ {
return ImGui::UpdatePlatformWindows(); return ImGui::UpdatePlatformWindows();
@@ -2021,13 +2025,13 @@ CIMGUI_API void ImDrawList_AddLine(ImDrawList* self,const ImVec2 p1,const ImVec2
{ {
return self->AddLine(p1,p2,col,thickness); return self->AddLine(p1,p2,col,thickness);
} }
CIMGUI_API void ImDrawList_AddRect(ImDrawList* self,const ImVec2 p_min,const ImVec2 p_max,ImU32 col,float rounding,ImDrawCornerFlags rounding_corners,float thickness) CIMGUI_API void ImDrawList_AddRect(ImDrawList* self,const ImVec2 p_min,const ImVec2 p_max,ImU32 col,float rounding,ImDrawFlags flags,float thickness)
{ {
return self->AddRect(p_min,p_max,col,rounding,rounding_corners,thickness); return self->AddRect(p_min,p_max,col,rounding,flags,thickness);
} }
CIMGUI_API void ImDrawList_AddRectFilled(ImDrawList* self,const ImVec2 p_min,const ImVec2 p_max,ImU32 col,float rounding,ImDrawCornerFlags rounding_corners) CIMGUI_API void ImDrawList_AddRectFilled(ImDrawList* self,const ImVec2 p_min,const ImVec2 p_max,ImU32 col,float rounding,ImDrawFlags flags)
{ {
return self->AddRectFilled(p_min,p_max,col,rounding,rounding_corners); return self->AddRectFilled(p_min,p_max,col,rounding,flags);
} }
CIMGUI_API void ImDrawList_AddRectFilledMultiColor(ImDrawList* self,const ImVec2 p_min,const ImVec2 p_max,ImU32 col_upr_left,ImU32 col_upr_right,ImU32 col_bot_right,ImU32 col_bot_left) CIMGUI_API void ImDrawList_AddRectFilledMultiColor(ImDrawList* self,const ImVec2 p_min,const ImVec2 p_max,ImU32 col_upr_left,ImU32 col_upr_right,ImU32 col_bot_right,ImU32 col_bot_left)
{ {
@@ -2073,9 +2077,9 @@ CIMGUI_API void ImDrawList_AddTextFontPtr(ImDrawList* self,const ImFont* font,fl
{ {
return self->AddText(font,font_size,pos,col,text_begin,text_end,wrap_width,cpu_fine_clip_rect); return self->AddText(font,font_size,pos,col,text_begin,text_end,wrap_width,cpu_fine_clip_rect);
} }
CIMGUI_API void ImDrawList_AddPolyline(ImDrawList* self,const ImVec2* points,int num_points,ImU32 col,bool closed,float thickness) CIMGUI_API void ImDrawList_AddPolyline(ImDrawList* self,const ImVec2* points,int num_points,ImU32 col,ImDrawFlags flags,float thickness)
{ {
return self->AddPolyline(points,num_points,col,closed,thickness); return self->AddPolyline(points,num_points,col,flags,thickness);
} }
CIMGUI_API void ImDrawList_AddConvexPolyFilled(ImDrawList* self,const ImVec2* points,int num_points,ImU32 col) CIMGUI_API void ImDrawList_AddConvexPolyFilled(ImDrawList* self,const ImVec2* points,int num_points,ImU32 col)
{ {
@@ -2097,9 +2101,9 @@ CIMGUI_API void ImDrawList_AddImageQuad(ImDrawList* self,ImTextureID user_textur
{ {
return self->AddImageQuad(user_texture_id,p1,p2,p3,p4,uv1,uv2,uv3,uv4,col); return self->AddImageQuad(user_texture_id,p1,p2,p3,p4,uv1,uv2,uv3,uv4,col);
} }
CIMGUI_API void ImDrawList_AddImageRounded(ImDrawList* self,ImTextureID user_texture_id,const ImVec2 p_min,const ImVec2 p_max,const ImVec2 uv_min,const ImVec2 uv_max,ImU32 col,float rounding,ImDrawCornerFlags rounding_corners) CIMGUI_API void ImDrawList_AddImageRounded(ImDrawList* self,ImTextureID user_texture_id,const ImVec2 p_min,const ImVec2 p_max,const ImVec2 uv_min,const ImVec2 uv_max,ImU32 col,float rounding,ImDrawFlags flags)
{ {
return self->AddImageRounded(user_texture_id,p_min,p_max,uv_min,uv_max,col,rounding,rounding_corners); return self->AddImageRounded(user_texture_id,p_min,p_max,uv_min,uv_max,col,rounding,flags);
} }
CIMGUI_API void ImDrawList_PathClear(ImDrawList* self) CIMGUI_API void ImDrawList_PathClear(ImDrawList* self)
{ {
@@ -2117,9 +2121,9 @@ CIMGUI_API void ImDrawList_PathFillConvex(ImDrawList* self,ImU32 col)
{ {
return self->PathFillConvex(col); return self->PathFillConvex(col);
} }
CIMGUI_API void ImDrawList_PathStroke(ImDrawList* self,ImU32 col,bool closed,float thickness) CIMGUI_API void ImDrawList_PathStroke(ImDrawList* self,ImU32 col,ImDrawFlags flags,float thickness)
{ {
return self->PathStroke(col,closed,thickness); return self->PathStroke(col,flags,thickness);
} }
CIMGUI_API void ImDrawList_PathArcTo(ImDrawList* self,const ImVec2 center,float radius,float a_min,float a_max,int num_segments) CIMGUI_API void ImDrawList_PathArcTo(ImDrawList* self,const ImVec2 center,float radius,float a_min,float a_max,int num_segments)
{ {
@@ -2137,9 +2141,9 @@ CIMGUI_API void ImDrawList_PathBezierQuadraticCurveTo(ImDrawList* self,const ImV
{ {
return self->PathBezierQuadraticCurveTo(p2,p3,num_segments); return self->PathBezierQuadraticCurveTo(p2,p3,num_segments);
} }
CIMGUI_API void ImDrawList_PathRect(ImDrawList* self,const ImVec2 rect_min,const ImVec2 rect_max,float rounding,ImDrawCornerFlags rounding_corners) CIMGUI_API void ImDrawList_PathRect(ImDrawList* self,const ImVec2 rect_min,const ImVec2 rect_max,float rounding,ImDrawFlags flags)
{ {
return self->PathRect(rect_min,rect_max,rounding,rounding_corners); return self->PathRect(rect_min,rect_max,rounding,flags);
} }
CIMGUI_API void ImDrawList_AddCallback(ImDrawList* self,ImDrawCallback callback,void* callback_data) CIMGUI_API void ImDrawList_AddCallback(ImDrawList* self,ImDrawCallback callback,void* callback_data)
{ {
@@ -2221,6 +2225,18 @@ CIMGUI_API void ImDrawList__OnChangedVtxOffset(ImDrawList* self)
{ {
return self->_OnChangedVtxOffset(); return self->_OnChangedVtxOffset();
} }
CIMGUI_API int ImDrawList__CalcCircleAutoSegmentCount(ImDrawList* self,float radius)
{
return self->_CalcCircleAutoSegmentCount(radius);
}
CIMGUI_API void ImDrawList__PathArcToFastEx(ImDrawList* self,const ImVec2 center,float radius,int a_min_sample,int a_max_sample,int a_step)
{
return self->_PathArcToFastEx(center,radius,a_min_sample,a_max_sample,a_step);
}
CIMGUI_API void ImDrawList__PathArcToN(ImDrawList* self,const ImVec2 center,float radius,float a_min,float a_max,int num_segments)
{
return self->_PathArcToN(center,radius,a_min,a_max,num_segments);
}
CIMGUI_API ImDrawData* ImDrawData_ImDrawData(void) CIMGUI_API ImDrawData* ImDrawData_ImDrawData(void)
{ {
return IM_NEW(ImDrawData)(); return IM_NEW(ImDrawData)();
@@ -2493,6 +2509,22 @@ CIMGUI_API bool ImFont_IsGlyphRangeUnused(ImFont* self,unsigned int c_begin,unsi
{ {
return self->IsGlyphRangeUnused(c_begin,c_last); return self->IsGlyphRangeUnused(c_begin,c_last);
} }
CIMGUI_API ImGuiViewport* ImGuiViewport_ImGuiViewport(void)
{
return IM_NEW(ImGuiViewport)();
}
CIMGUI_API void ImGuiViewport_destroy(ImGuiViewport* self)
{
IM_DELETE(self);
}
CIMGUI_API void ImGuiViewport_GetCenter(ImVec2 *pOut,ImGuiViewport* self)
{
*pOut = self->GetCenter();
}
CIMGUI_API void ImGuiViewport_GetWorkCenter(ImVec2 *pOut,ImGuiViewport* self)
{
*pOut = self->GetWorkCenter();
}
CIMGUI_API ImGuiPlatformIO* ImGuiPlatformIO_ImGuiPlatformIO(void) CIMGUI_API ImGuiPlatformIO* ImGuiPlatformIO_ImGuiPlatformIO(void)
{ {
return IM_NEW(ImGuiPlatformIO)(); return IM_NEW(ImGuiPlatformIO)();
@@ -2509,26 +2541,6 @@ CIMGUI_API void ImGuiPlatformMonitor_destroy(ImGuiPlatformMonitor* self)
{ {
IM_DELETE(self); IM_DELETE(self);
} }
CIMGUI_API ImGuiViewport* ImGuiViewport_ImGuiViewport(void)
{
return IM_NEW(ImGuiViewport)();
}
CIMGUI_API void ImGuiViewport_destroy(ImGuiViewport* self)
{
IM_DELETE(self);
}
CIMGUI_API void ImGuiViewport_GetCenter(ImVec2 *pOut,ImGuiViewport* self)
{
*pOut = self->GetCenter();
}
CIMGUI_API void ImGuiViewport_GetWorkPos(ImVec2 *pOut,ImGuiViewport* self)
{
*pOut = self->GetWorkPos();
}
CIMGUI_API void ImGuiViewport_GetWorkSize(ImVec2 *pOut,ImGuiViewport* self)
{
*pOut = self->GetWorkSize();
}
CIMGUI_API ImGuiID igImHashData(const void* data,size_t data_size,ImU32 seed) CIMGUI_API ImGuiID igImHashData(const void* data,size_t data_size,ImU32 seed)
{ {
return ImHashData(data,data_size,seed); return ImHashData(data,data_size,seed);
@@ -2889,6 +2901,10 @@ CIMGUI_API float ImRect_GetHeight(ImRect* self)
{ {
return self->GetHeight(); return self->GetHeight();
} }
CIMGUI_API float ImRect_GetArea(ImRect* self)
{
return self->GetArea();
}
CIMGUI_API void ImRect_GetTL(ImVec2 *pOut,ImRect* self) CIMGUI_API void ImRect_GetTL(ImVec2 *pOut,ImRect* self)
{ {
*pOut = self->GetTL(); *pOut = self->GetTL();
@@ -3009,9 +3025,9 @@ CIMGUI_API void ImDrawListSharedData_destroy(ImDrawListSharedData* self)
{ {
IM_DELETE(self); IM_DELETE(self);
} }
CIMGUI_API void ImDrawListSharedData_SetCircleSegmentMaxError(ImDrawListSharedData* self,float max_error) CIMGUI_API void ImDrawListSharedData_SetCircleTessellationMaxError(ImDrawListSharedData* self,float max_error)
{ {
return self->SetCircleSegmentMaxError(max_error); return self->SetCircleTessellationMaxError(max_error);
} }
CIMGUI_API void ImDrawDataBuilder_Clear(ImDrawDataBuilder* self) CIMGUI_API void ImDrawDataBuilder_Clear(ImDrawDataBuilder* self)
{ {
@@ -3021,6 +3037,10 @@ CIMGUI_API void ImDrawDataBuilder_ClearFreeMemory(ImDrawDataBuilder* self)
{ {
return self->ClearFreeMemory(); return self->ClearFreeMemory();
} }
CIMGUI_API int ImDrawDataBuilder_GetDrawListCount(ImDrawDataBuilder* self)
{
return self->GetDrawListCount();
}
CIMGUI_API void ImDrawDataBuilder_FlattenIntoSingleLayer(ImDrawDataBuilder* self) CIMGUI_API void ImDrawDataBuilder_FlattenIntoSingleLayer(ImDrawDataBuilder* self)
{ {
return self->FlattenIntoSingleLayer(); return self->FlattenIntoSingleLayer();
@@ -3257,6 +3277,10 @@ CIMGUI_API void ImGuiViewportP_GetWorkRect(ImRect *pOut,ImGuiViewportP* self)
{ {
*pOut = self->GetWorkRect(); *pOut = self->GetWorkRect();
} }
CIMGUI_API void ImGuiViewportP_UpdateWorkRect(ImGuiViewportP* self)
{
return self->UpdateWorkRect();
}
CIMGUI_API void ImGuiViewportP_ClearRequestFlags(ImGuiViewportP* self) CIMGUI_API void ImGuiViewportP_ClearRequestFlags(ImGuiViewportP* self)
{ {
return self->ClearRequestFlags(); return self->ClearRequestFlags();
@@ -3573,10 +3597,14 @@ CIMGUI_API void igUpdateMouseMovingWindowEndFrame()
{ {
return ImGui::UpdateMouseMovingWindowEndFrame(); return ImGui::UpdateMouseMovingWindowEndFrame();
} }
CIMGUI_API void igAddContextHook(ImGuiContext* context,const ImGuiContextHook* hook) CIMGUI_API ImGuiID igAddContextHook(ImGuiContext* context,const ImGuiContextHook* hook)
{ {
return ImGui::AddContextHook(context,hook); return ImGui::AddContextHook(context,hook);
} }
CIMGUI_API void igRemoveContextHook(ImGuiContext* context,ImGuiID hook_to_remove)
{
return ImGui::RemoveContextHook(context,hook_to_remove);
}
CIMGUI_API void igCallContextHooks(ImGuiContext* context,ImGuiContextHookType type) CIMGUI_API void igCallContextHooks(ImGuiContext* context,ImGuiContextHookType type)
{ {
return ImGui::CallContextHooks(context,type); return ImGui::CallContextHooks(context,type);
@@ -3593,6 +3621,10 @@ CIMGUI_API void igDestroyPlatformWindow(ImGuiViewportP* viewport)
{ {
return ImGui::DestroyPlatformWindow(viewport); return ImGui::DestroyPlatformWindow(viewport);
} }
CIMGUI_API const ImGuiPlatformMonitor* igGetViewportPlatformMonitor(ImGuiViewport* viewport)
{
return ImGui::GetViewportPlatformMonitor(viewport);
}
CIMGUI_API void igMarkIniSettingsDirtyNil() CIMGUI_API void igMarkIniSettingsDirtyNil()
{ {
return ImGui::MarkIniSettingsDirty(); return ImGui::MarkIniSettingsDirty();
@@ -3773,6 +3805,14 @@ CIMGUI_API void igLogToBuffer(int auto_open_depth)
{ {
return ImGui::LogToBuffer(auto_open_depth); return ImGui::LogToBuffer(auto_open_depth);
} }
CIMGUI_API void igLogRenderedText(const ImVec2* ref_pos,const char* text,const char* text_end)
{
return ImGui::LogRenderedText(ref_pos,text,text_end);
}
CIMGUI_API void igLogSetNextTextDecoration(const char* prefix,const char* suffix)
{
return ImGui::LogSetNextTextDecoration(prefix,suffix);
}
CIMGUI_API bool igBeginChildEx(const char* name,ImGuiID id,const ImVec2 size_arg,bool border,ImGuiWindowFlags flags) CIMGUI_API bool igBeginChildEx(const char* name,ImGuiID id,const ImVec2 size_arg,bool border,ImGuiWindowFlags flags)
{ {
return ImGui::BeginChildEx(name,id,size_arg,border,flags); return ImGui::BeginChildEx(name,id,size_arg,border,flags);
@@ -3849,13 +3889,9 @@ CIMGUI_API void igActivateItem(ImGuiID id)
{ {
return ImGui::ActivateItem(id); return ImGui::ActivateItem(id);
} }
CIMGUI_API void igSetNavID(ImGuiID id,int nav_layer,ImGuiID focus_scope_id) CIMGUI_API void igSetNavID(ImGuiID id,int nav_layer,ImGuiID focus_scope_id,const ImRect rect_rel)
{ {
return ImGui::SetNavID(id,nav_layer,focus_scope_id); return ImGui::SetNavID(id,nav_layer,focus_scope_id,rect_rel);
}
CIMGUI_API void igSetNavIDWithRectRel(ImGuiID id,int nav_layer,ImGuiID focus_scope_id,const ImRect rect_rel)
{
return ImGui::SetNavIDWithRectRel(id,nav_layer,focus_scope_id,rect_rel);
} }
CIMGUI_API void igPushFocusScope(ImGuiID id) CIMGUI_API void igPushFocusScope(ImGuiID id)
{ {
@@ -4105,6 +4141,10 @@ CIMGUI_API void igTableOpenContextMenu(int column_n)
{ {
return ImGui::TableOpenContextMenu(column_n); return ImGui::TableOpenContextMenu(column_n);
} }
CIMGUI_API void igTableSetColumnEnabled(int column_n,bool enabled)
{
return ImGui::TableSetColumnEnabled(column_n,enabled);
}
CIMGUI_API void igTableSetColumnWidth(int column_n,float width) CIMGUI_API void igTableSetColumnWidth(int column_n,float width)
{ {
return ImGui::TableSetColumnWidth(column_n,width); return ImGui::TableSetColumnWidth(column_n,width);
@@ -4129,6 +4169,10 @@ CIMGUI_API void igTablePopBackgroundChannel()
{ {
return ImGui::TablePopBackgroundChannel(); return ImGui::TablePopBackgroundChannel();
} }
CIMGUI_API ImGuiTable* igGetCurrentTable()
{
return ImGui::GetCurrentTable();
}
CIMGUI_API ImGuiTable* igTableFindByID(ImGuiID id) CIMGUI_API ImGuiTable* igTableFindByID(ImGuiID id)
{ {
return ImGui::TableFindByID(id); return ImGui::TableFindByID(id);
@@ -4349,9 +4393,9 @@ CIMGUI_API void igRenderFrameBorder(ImVec2 p_min,ImVec2 p_max,float rounding)
{ {
return ImGui::RenderFrameBorder(p_min,p_max,rounding); return ImGui::RenderFrameBorder(p_min,p_max,rounding);
} }
CIMGUI_API void igRenderColorRectWithAlphaCheckerboard(ImDrawList* draw_list,ImVec2 p_min,ImVec2 p_max,ImU32 fill_col,float grid_step,ImVec2 grid_off,float rounding,int rounding_corners_flags) CIMGUI_API void igRenderColorRectWithAlphaCheckerboard(ImDrawList* draw_list,ImVec2 p_min,ImVec2 p_max,ImU32 fill_col,float grid_step,ImVec2 grid_off,float rounding,ImDrawFlags flags)
{ {
return ImGui::RenderColorRectWithAlphaCheckerboard(draw_list,p_min,p_max,fill_col,grid_step,grid_off,rounding,rounding_corners_flags); return ImGui::RenderColorRectWithAlphaCheckerboard(draw_list,p_min,p_max,fill_col,grid_step,grid_off,rounding,flags);
} }
CIMGUI_API void igRenderNavHighlight(const ImRect bb,ImGuiID id,ImGuiNavHighlightFlags flags) CIMGUI_API void igRenderNavHighlight(const ImRect bb,ImGuiID id,ImGuiNavHighlightFlags flags)
{ {
@@ -4361,10 +4405,6 @@ CIMGUI_API const char* igFindRenderedTextEnd(const char* text,const char* text_e
{ {
return ImGui::FindRenderedTextEnd(text,text_end); return ImGui::FindRenderedTextEnd(text,text_end);
} }
CIMGUI_API void igLogRenderedText(const ImVec2* ref_pos,const char* text,const char* text_end)
{
return ImGui::LogRenderedText(ref_pos,text,text_end);
}
CIMGUI_API void igRenderArrow(ImDrawList* draw_list,ImVec2 pos,ImU32 col,ImGuiDir dir,float scale) CIMGUI_API void igRenderArrow(ImDrawList* draw_list,ImVec2 pos,ImU32 col,ImGuiDir dir,float scale)
{ {
return ImGui::RenderArrow(draw_list,pos,col,dir,scale); return ImGui::RenderArrow(draw_list,pos,col,dir,scale);
@@ -4421,9 +4461,9 @@ CIMGUI_API void igScrollbar(ImGuiAxis axis)
{ {
return ImGui::Scrollbar(axis); return ImGui::Scrollbar(axis);
} }
CIMGUI_API bool igScrollbarEx(const ImRect bb,ImGuiID id,ImGuiAxis axis,float* p_scroll_v,float avail_v,float contents_v,ImDrawCornerFlags rounding_corners) CIMGUI_API bool igScrollbarEx(const ImRect bb,ImGuiID id,ImGuiAxis axis,float* p_scroll_v,float avail_v,float contents_v,ImDrawFlags flags)
{ {
return ImGui::ScrollbarEx(bb,id,axis,p_scroll_v,avail_v,contents_v,rounding_corners); return ImGui::ScrollbarEx(bb,id,axis,p_scroll_v,avail_v,contents_v,flags);
} }
CIMGUI_API bool igImageButtonEx(ImGuiID id,ImTextureID texture_id,const ImVec2 size,const ImVec2 uv0,const ImVec2 uv1,const ImVec2 padding,const ImVec4 bg_col,const ImVec4 tint_col) CIMGUI_API bool igImageButtonEx(ImGuiID id,ImTextureID texture_id,const ImVec2 size,const ImVec2 uv0,const ImVec2 uv1,const ImVec2 padding,const ImVec4 bg_col,const ImVec4 tint_col)
{ {
@@ -4621,9 +4661,13 @@ CIMGUI_API void igDebugNodeViewport(ImGuiViewportP* viewport)
{ {
return ImGui::DebugNodeViewport(viewport); return ImGui::DebugNodeViewport(viewport);
} }
CIMGUI_API bool igImFontAtlasBuildWithStbTruetype(ImFontAtlas* atlas) CIMGUI_API void igDebugRenderViewportThumbnail(ImDrawList* draw_list,ImGuiViewportP* viewport,const ImRect bb)
{ {
return ImFontAtlasBuildWithStbTruetype(atlas); return ImGui::DebugRenderViewportThumbnail(draw_list,viewport,bb);
}
CIMGUI_API const ImFontBuilderIO* igImFontAtlasGetBuilderForStbTruetype()
{
return ImFontAtlasGetBuilderForStbTruetype();
} }
CIMGUI_API void igImFontAtlasBuildInit(ImFontAtlas* atlas) CIMGUI_API void igImFontAtlasBuildInit(ImFontAtlas* atlas)
{ {
@@ -4641,9 +4685,13 @@ CIMGUI_API void igImFontAtlasBuildFinish(ImFontAtlas* atlas)
{ {
return ImFontAtlasBuildFinish(atlas); return ImFontAtlasBuildFinish(atlas);
} }
CIMGUI_API void igImFontAtlasBuildRender1bppRectFromString(ImFontAtlas* atlas,int atlas_x,int atlas_y,int w,int h,const char* in_str,char in_marker_char,unsigned char in_marker_pixel_value) CIMGUI_API void igImFontAtlasBuildRender8bppRectFromString(ImFontAtlas* atlas,int x,int y,int w,int h,const char* in_str,char in_marker_char,unsigned char in_marker_pixel_value)
{ {
return ImFontAtlasBuildRender1bppRectFromString(atlas,atlas_x,atlas_y,w,h,in_str,in_marker_char,in_marker_pixel_value); return ImFontAtlasBuildRender8bppRectFromString(atlas,x,y,w,h,in_str,in_marker_char,in_marker_pixel_value);
}
CIMGUI_API void igImFontAtlasBuildRender32bppRectFromString(ImFontAtlas* atlas,int x,int y,int w,int h,const char* in_str,char in_marker_char,unsigned int in_marker_pixel_value)
{
return ImFontAtlasBuildRender32bppRectFromString(atlas,x,y,w,h,in_str,in_marker_char,in_marker_pixel_value);
} }
CIMGUI_API void igImFontAtlasBuildMultiplyCalcLookupTable(unsigned char out_table[256],float in_multiply_factor) CIMGUI_API void igImFontAtlasBuildMultiplyCalcLookupTable(unsigned char out_table[256],float in_multiply_factor)
{ {

235
cimgui.h
View File

@@ -1,5 +1,5 @@
//This file is automatically generated by generator.lua from https://github.com/cimgui/cimgui //This file is automatically generated by generator.lua from https://github.com/cimgui/cimgui
//based on imgui.h file version "1.80" from Dear ImGui https://github.com/ocornut/imgui //based on imgui.h file version "1.82" from Dear ImGui https://github.com/ocornut/imgui
//with imgui_internal.h api //with imgui_internal.h api
//docking branch //docking branch
#ifndef CIMGUI_INCLUDED #ifndef CIMGUI_INCLUDED
@@ -116,6 +116,7 @@ typedef struct ImColor ImColor;
typedef struct ImFontGlyphRangesBuilder ImFontGlyphRangesBuilder; typedef struct ImFontGlyphRangesBuilder ImFontGlyphRangesBuilder;
typedef struct ImFontGlyph ImFontGlyph; typedef struct ImFontGlyph ImFontGlyph;
typedef struct ImFontConfig ImFontConfig; typedef struct ImFontConfig ImFontConfig;
typedef struct ImFontBuilderIO ImFontBuilderIO;
typedef struct ImFontAtlas ImFontAtlas; typedef struct ImFontAtlas ImFontAtlas;
typedef struct ImFont ImFont; typedef struct ImFont ImFont;
typedef struct ImDrawVert ImDrawVert; typedef struct ImDrawVert ImDrawVert;
@@ -135,6 +136,7 @@ struct ImDrawListSplitter;
struct ImDrawVert; struct ImDrawVert;
struct ImFont; struct ImFont;
struct ImFontAtlas; struct ImFontAtlas;
struct ImFontBuilderIO;
struct ImFontConfig; struct ImFontConfig;
struct ImFontGlyph; struct ImFontGlyph;
struct ImFontGlyphRangesBuilder; struct ImFontGlyphRangesBuilder;
@@ -167,7 +169,7 @@ typedef int ImGuiMouseCursor;
typedef int ImGuiSortDirection; typedef int ImGuiSortDirection;
typedef int ImGuiStyleVar; typedef int ImGuiStyleVar;
typedef int ImGuiTableBgTarget; typedef int ImGuiTableBgTarget;
typedef int ImDrawCornerFlags; typedef int ImDrawFlags;
typedef int ImDrawListFlags; typedef int ImDrawListFlags;
typedef int ImFontAtlasFlags; typedef int ImFontAtlasFlags;
typedef int ImGuiBackendFlags; typedef int ImGuiBackendFlags;
@@ -196,6 +198,8 @@ typedef void* ImTextureID;
typedef unsigned int ImGuiID; typedef unsigned int ImGuiID;
typedef int (*ImGuiInputTextCallback)(ImGuiInputTextCallbackData* data); typedef int (*ImGuiInputTextCallback)(ImGuiInputTextCallbackData* data);
typedef void (*ImGuiSizeCallback)(ImGuiSizeCallbackData* data); typedef void (*ImGuiSizeCallback)(ImGuiSizeCallbackData* data);
typedef void* (*ImGuiMemAllocFunc)(size_t sz, void* user_data);
typedef void (*ImGuiMemFreeFunc)(void* ptr, void* user_data);
typedef unsigned short ImWchar16; typedef unsigned short ImWchar16;
typedef unsigned int ImWchar32; typedef unsigned int ImWchar32;
typedef ImWchar16 ImWchar; typedef ImWchar16 ImWchar;
@@ -370,7 +374,7 @@ typedef enum {
ImGuiInputTextFlags_AllowTabInput = 1 << 10, ImGuiInputTextFlags_AllowTabInput = 1 << 10,
ImGuiInputTextFlags_CtrlEnterForNewLine = 1 << 11, ImGuiInputTextFlags_CtrlEnterForNewLine = 1 << 11,
ImGuiInputTextFlags_NoHorizontalScroll = 1 << 12, ImGuiInputTextFlags_NoHorizontalScroll = 1 << 12,
ImGuiInputTextFlags_AlwaysInsertMode = 1 << 13, ImGuiInputTextFlags_AlwaysOverwrite = 1 << 13,
ImGuiInputTextFlags_ReadOnly = 1 << 14, ImGuiInputTextFlags_ReadOnly = 1 << 14,
ImGuiInputTextFlags_Password = 1 << 15, ImGuiInputTextFlags_Password = 1 << 15,
ImGuiInputTextFlags_NoUndoRedo = 1 << 16, ImGuiInputTextFlags_NoUndoRedo = 1 << 16,
@@ -876,7 +880,7 @@ struct ImGuiStyle
bool AntiAliasedLinesUseTex; bool AntiAliasedLinesUseTex;
bool AntiAliasedFill; bool AntiAliasedFill;
float CurveTessellationTol; float CurveTessellationTol;
float CircleSegmentMaxError; float CircleTessellationMaxError;
ImVec4 Colors[ImGuiCol_COUNT]; ImVec4 Colors[ImGuiCol_COUNT];
}; };
struct ImGuiIO struct ImGuiIO
@@ -1107,17 +1111,21 @@ struct ImDrawListSplitter
ImVector_ImDrawChannel _Channels; ImVector_ImDrawChannel _Channels;
}; };
typedef enum { typedef enum {
ImDrawCornerFlags_None = 0, ImDrawFlags_None = 0,
ImDrawCornerFlags_TopLeft = 1 << 0, ImDrawFlags_Closed = 1 << 0,
ImDrawCornerFlags_TopRight = 1 << 1, ImDrawFlags_RoundCornersTopLeft = 1 << 4,
ImDrawCornerFlags_BotLeft = 1 << 2, ImDrawFlags_RoundCornersTopRight = 1 << 5,
ImDrawCornerFlags_BotRight = 1 << 3, ImDrawFlags_RoundCornersBottomLeft = 1 << 6,
ImDrawCornerFlags_Top = ImDrawCornerFlags_TopLeft | ImDrawCornerFlags_TopRight, ImDrawFlags_RoundCornersBottomRight = 1 << 7,
ImDrawCornerFlags_Bot = ImDrawCornerFlags_BotLeft | ImDrawCornerFlags_BotRight, ImDrawFlags_RoundCornersNone = 1 << 8,
ImDrawCornerFlags_Left = ImDrawCornerFlags_TopLeft | ImDrawCornerFlags_BotLeft, ImDrawFlags_RoundCornersTop = ImDrawFlags_RoundCornersTopLeft | ImDrawFlags_RoundCornersTopRight,
ImDrawCornerFlags_Right = ImDrawCornerFlags_TopRight | ImDrawCornerFlags_BotRight, ImDrawFlags_RoundCornersBottom = ImDrawFlags_RoundCornersBottomLeft | ImDrawFlags_RoundCornersBottomRight,
ImDrawCornerFlags_All = 0xF ImDrawFlags_RoundCornersLeft = ImDrawFlags_RoundCornersBottomLeft | ImDrawFlags_RoundCornersTopLeft,
}ImDrawCornerFlags_; ImDrawFlags_RoundCornersRight = ImDrawFlags_RoundCornersBottomRight | ImDrawFlags_RoundCornersTopRight,
ImDrawFlags_RoundCornersAll = ImDrawFlags_RoundCornersTopLeft | ImDrawFlags_RoundCornersTopRight | ImDrawFlags_RoundCornersBottomLeft | ImDrawFlags_RoundCornersBottomRight,
ImDrawFlags_RoundCornersDefault_ = ImDrawFlags_RoundCornersAll,
ImDrawFlags_RoundCornersMask_ = ImDrawFlags_RoundCornersAll | ImDrawFlags_RoundCornersNone
}ImDrawFlags_;
typedef enum { typedef enum {
ImDrawListFlags_None = 0, ImDrawListFlags_None = 0,
ImDrawListFlags_AntiAliasedLines = 1 << 0, ImDrawListFlags_AntiAliasedLines = 1 << 0,
@@ -1146,10 +1154,10 @@ struct ImDrawList
struct ImDrawData struct ImDrawData
{ {
bool Valid; bool Valid;
ImDrawList** CmdLists;
int CmdListsCount; int CmdListsCount;
int TotalIdxCount; int TotalIdxCount;
int TotalVtxCount; int TotalVtxCount;
ImDrawList** CmdLists;
ImVec2 DisplayPos; ImVec2 DisplayPos;
ImVec2 DisplaySize; ImVec2 DisplaySize;
ImVec2 FramebufferScale; ImVec2 FramebufferScale;
@@ -1171,7 +1179,7 @@ struct ImFontConfig
float GlyphMinAdvanceX; float GlyphMinAdvanceX;
float GlyphMaxAdvanceX; float GlyphMaxAdvanceX;
bool MergeMode; bool MergeMode;
unsigned int RasterizerFlags; unsigned int FontBuilderFlags;
float RasterizerMultiply; float RasterizerMultiply;
ImWchar EllipsisChar; ImWchar EllipsisChar;
char Name[40]; char Name[40];
@@ -1179,8 +1187,9 @@ struct ImFontConfig
}; };
struct ImFontGlyph struct ImFontGlyph
{ {
unsigned int Codepoint : 31; unsigned int Colored : 1;
unsigned int Visible : 1; unsigned int Visible : 1;
unsigned int Codepoint : 30;
float AdvanceX; float AdvanceX;
float X0, Y0, X1, Y1; float X0, Y0, X1, Y1;
float U0, V0, U1, V1; float U0, V0, U1, V1;
@@ -1206,11 +1215,12 @@ typedef enum {
}ImFontAtlasFlags_; }ImFontAtlasFlags_;
struct ImFontAtlas struct ImFontAtlas
{ {
bool Locked;
ImFontAtlasFlags Flags; ImFontAtlasFlags Flags;
ImTextureID TexID; ImTextureID TexID;
int TexDesiredWidth; int TexDesiredWidth;
int TexGlyphPadding; int TexGlyphPadding;
bool Locked;
bool TexPixelsUseColors;
unsigned char* TexPixelsAlpha8; unsigned char* TexPixelsAlpha8;
unsigned int* TexPixelsRGBA32; unsigned int* TexPixelsRGBA32;
int TexWidth; int TexWidth;
@@ -1221,6 +1231,8 @@ struct ImFontAtlas
ImVector_ImFontAtlasCustomRect CustomRects; ImVector_ImFontAtlasCustomRect CustomRects;
ImVector_ImFontConfig ConfigData; ImVector_ImFontConfig ConfigData;
ImVec4 TexUvLines[(63) + 1]; ImVec4 TexUvLines[(63) + 1];
const ImFontBuilderIO* FontBuilderIO;
unsigned int FontBuilderFlags;
int PackIdMouseCursors; int PackIdMouseCursors;
int PackIdLines; int PackIdLines;
}; };
@@ -1243,6 +1255,41 @@ struct ImFont
int MetricsTotalSurface; int MetricsTotalSurface;
ImU8 Used4kPagesMap[(0xFFFF +1)/4096/8]; ImU8 Used4kPagesMap[(0xFFFF +1)/4096/8];
}; };
typedef enum {
ImGuiViewportFlags_None = 0,
ImGuiViewportFlags_IsPlatformWindow = 1 << 0,
ImGuiViewportFlags_IsPlatformMonitor = 1 << 1,
ImGuiViewportFlags_OwnedByApp = 1 << 2,
ImGuiViewportFlags_NoDecoration = 1 << 3,
ImGuiViewportFlags_NoTaskBarIcon = 1 << 4,
ImGuiViewportFlags_NoFocusOnAppearing = 1 << 5,
ImGuiViewportFlags_NoFocusOnClick = 1 << 6,
ImGuiViewportFlags_NoInputs = 1 << 7,
ImGuiViewportFlags_NoRendererClear = 1 << 8,
ImGuiViewportFlags_TopMost = 1 << 9,
ImGuiViewportFlags_Minimized = 1 << 10,
ImGuiViewportFlags_NoAutoMerge = 1 << 11,
ImGuiViewportFlags_CanHostOtherWindows = 1 << 12
}ImGuiViewportFlags_;
struct ImGuiViewport
{
ImGuiID ID;
ImGuiViewportFlags Flags;
ImVec2 Pos;
ImVec2 Size;
ImVec2 WorkPos;
ImVec2 WorkSize;
float DpiScale;
ImGuiID ParentViewportId;
ImDrawData* DrawData;
void* RendererUserData;
void* PlatformUserData;
void* PlatformHandle;
void* PlatformHandleRaw;
bool PlatformRequestMove;
bool PlatformRequestResize;
bool PlatformRequestClose;
};
struct ImGuiPlatformIO struct ImGuiPlatformIO
{ {
void (*Platform_CreateWindow)(ImGuiViewport* vp); void (*Platform_CreateWindow)(ImGuiViewport* vp);
@@ -1270,7 +1317,6 @@ struct ImGuiPlatformIO
void (*Renderer_RenderWindow)(ImGuiViewport* vp, void* render_arg); void (*Renderer_RenderWindow)(ImGuiViewport* vp, void* render_arg);
void (*Renderer_SwapBuffers)(ImGuiViewport* vp, void* render_arg); void (*Renderer_SwapBuffers)(ImGuiViewport* vp, void* render_arg);
ImVector_ImGuiPlatformMonitor Monitors; ImVector_ImGuiPlatformMonitor Monitors;
ImGuiViewport* MainViewport;
ImVector_ImGuiViewportPtr Viewports; ImVector_ImGuiViewportPtr Viewports;
}; };
struct ImGuiPlatformMonitor struct ImGuiPlatformMonitor
@@ -1279,38 +1325,6 @@ struct ImGuiPlatformMonitor
ImVec2 WorkPos, WorkSize; ImVec2 WorkPos, WorkSize;
float DpiScale; float DpiScale;
}; };
typedef enum {
ImGuiViewportFlags_None = 0,
ImGuiViewportFlags_NoDecoration = 1 << 0,
ImGuiViewportFlags_NoTaskBarIcon = 1 << 1,
ImGuiViewportFlags_NoFocusOnAppearing = 1 << 2,
ImGuiViewportFlags_NoFocusOnClick = 1 << 3,
ImGuiViewportFlags_NoInputs = 1 << 4,
ImGuiViewportFlags_NoRendererClear = 1 << 5,
ImGuiViewportFlags_TopMost = 1 << 6,
ImGuiViewportFlags_Minimized = 1 << 7,
ImGuiViewportFlags_NoAutoMerge = 1 << 8,
ImGuiViewportFlags_CanHostOtherWindows = 1 << 9
}ImGuiViewportFlags_;
struct ImGuiViewport
{
ImGuiID ID;
ImGuiViewportFlags Flags;
ImVec2 Pos;
ImVec2 Size;
ImVec2 WorkOffsetMin;
ImVec2 WorkOffsetMax;
float DpiScale;
ImDrawData* DrawData;
ImGuiID ParentViewportId;
void* RendererUserData;
void* PlatformUserData;
void* PlatformHandle;
void* PlatformHandleRaw;
bool PlatformRequestMove;
bool PlatformRequestResize;
bool PlatformRequestClose;
};
struct StbUndoRecord struct StbUndoRecord
{ {
int where; int where;
@@ -1373,7 +1387,8 @@ struct ImDrawListSharedData
float CircleSegmentMaxError; float CircleSegmentMaxError;
ImVec4 ClipRectFullscreen; ImVec4 ClipRectFullscreen;
ImDrawListFlags InitialFlags; ImDrawListFlags InitialFlags;
ImVec2 ArcFastVtx[12 * 1]; ImVec2 ArcFastVtx[48];
float ArcFastRadiusCutoff;
ImU8 CircleSegmentCounts[64]; ImU8 CircleSegmentCounts[64];
const ImVec4* TexUvLines; const ImVec4* TexUvLines;
}; };
@@ -1401,7 +1416,8 @@ typedef enum {
ImGuiItemStatusFlags_ToggledSelection = 1 << 3, ImGuiItemStatusFlags_ToggledSelection = 1 << 3,
ImGuiItemStatusFlags_ToggledOpen = 1 << 4, ImGuiItemStatusFlags_ToggledOpen = 1 << 4,
ImGuiItemStatusFlags_HasDeactivated = 1 << 5, ImGuiItemStatusFlags_HasDeactivated = 1 << 5,
ImGuiItemStatusFlags_Deactivated = 1 << 6 ImGuiItemStatusFlags_Deactivated = 1 << 6,
ImGuiItemStatusFlags_HoveredWindow = 1 << 7
}ImGuiItemStatusFlags_; }ImGuiItemStatusFlags_;
typedef enum { typedef enum {
ImGuiButtonFlags_PressedOnClick = 1 << 4, ImGuiButtonFlags_PressedOnClick = 1 << 4,
@@ -1476,9 +1492,9 @@ typedef enum {
typedef enum { typedef enum {
ImGuiInputSource_None = 0, ImGuiInputSource_None = 0,
ImGuiInputSource_Mouse, ImGuiInputSource_Mouse,
ImGuiInputSource_Keyboard,
ImGuiInputSource_Gamepad,
ImGuiInputSource_Nav, ImGuiInputSource_Nav,
ImGuiInputSource_NavKeyboard,
ImGuiInputSource_NavGamepad,
ImGuiInputSource_COUNT ImGuiInputSource_COUNT
}ImGuiInputSource; }ImGuiInputSource;
typedef enum { typedef enum {
@@ -1564,6 +1580,7 @@ struct ImGuiGroupData
float BackupCurrLineTextBaseOffset; float BackupCurrLineTextBaseOffset;
ImGuiID BackupActiveIdIsAlive; ImGuiID BackupActiveIdIsAlive;
bool BackupActiveIdPreviousFrameIsAlive; bool BackupActiveIdPreviousFrameIsAlive;
bool BackupHoveredIdIsAlive;
bool EmitItem; bool EmitItem;
}; };
struct ImGuiMenuColumns struct ImGuiMenuColumns
@@ -1767,7 +1784,6 @@ struct ImGuiDockNode
bool IsFocused :1; bool IsFocused :1;
bool HasCloseButton :1; bool HasCloseButton :1;
bool HasWindowMenuButton :1; bool HasWindowMenuButton :1;
bool EnableCloseButton :1;
bool WantCloseAll :1; bool WantCloseAll :1;
bool WantLockSizeOnce :1; bool WantLockSizeOnce :1;
bool WantMouseMove :1; bool WantMouseMove :1;
@@ -1800,7 +1816,6 @@ struct ImGuiViewportP
ImGuiViewport _ImGuiViewport; ImGuiViewport _ImGuiViewport;
int Idx; int Idx;
int LastFrameActive; int LastFrameActive;
int LastFrameDrawLists[2];
int LastFrontMostStampCount; int LastFrontMostStampCount;
ImGuiID LastNameHash; ImGuiID LastNameHash;
ImVec2 LastPos; ImVec2 LastPos;
@@ -1809,12 +1824,15 @@ struct ImGuiViewportP
short PlatformMonitor; short PlatformMonitor;
bool PlatformWindowCreated; bool PlatformWindowCreated;
ImGuiWindow* Window; ImGuiWindow* Window;
int DrawListsLastFrame[2];
ImDrawList* DrawLists[2]; ImDrawList* DrawLists[2];
ImDrawData DrawDataP; ImDrawData DrawDataP;
ImDrawDataBuilder DrawDataBuilder; ImDrawDataBuilder DrawDataBuilder;
ImVec2 LastPlatformPos; ImVec2 LastPlatformPos;
ImVec2 LastPlatformSize; ImVec2 LastPlatformSize;
ImVec2 LastRendererSize; ImVec2 LastRendererSize;
ImVec2 WorkOffsetMin;
ImVec2 WorkOffsetMax;
ImVec2 CurrWorkOffsetMin; ImVec2 CurrWorkOffsetMin;
ImVec2 CurrWorkOffsetMax; ImVec2 CurrWorkOffsetMax;
}; };
@@ -1864,9 +1882,10 @@ struct ImGuiStackSizes
short SizeOfGroupStack; short SizeOfGroupStack;
short SizeOfBeginPopupStack; short SizeOfBeginPopupStack;
}; };
typedef enum { ImGuiContextHookType_NewFramePre, ImGuiContextHookType_NewFramePost, ImGuiContextHookType_EndFramePre, ImGuiContextHookType_EndFramePost, ImGuiContextHookType_RenderPre, ImGuiContextHookType_RenderPost, ImGuiContextHookType_Shutdown }ImGuiContextHookType; typedef enum { ImGuiContextHookType_NewFramePre, ImGuiContextHookType_NewFramePost, ImGuiContextHookType_EndFramePre, ImGuiContextHookType_EndFramePost, ImGuiContextHookType_RenderPre, ImGuiContextHookType_RenderPost, ImGuiContextHookType_Shutdown, ImGuiContextHookType_PendingRemoval_ }ImGuiContextHookType;
struct ImGuiContextHook struct ImGuiContextHook
{ {
ImGuiID HookId;
ImGuiContextHookType Type; ImGuiContextHookType Type;
ImGuiID Owner; ImGuiID Owner;
ImGuiContextHookCallback Callback; ImGuiContextHookCallback Callback;
@@ -1905,7 +1924,6 @@ struct ImGuiContext
int WindowsActiveCount; int WindowsActiveCount;
ImGuiWindow* CurrentWindow; ImGuiWindow* CurrentWindow;
ImGuiWindow* HoveredWindow; ImGuiWindow* HoveredWindow;
ImGuiWindow* HoveredRootWindow;
ImGuiWindow* HoveredWindowUnderMovingWindow; ImGuiWindow* HoveredWindowUnderMovingWindow;
ImGuiDockNode* HoveredDockNode; ImGuiDockNode* HoveredDockNode;
ImGuiWindow* MovingWindow; ImGuiWindow* MovingWindow;
@@ -1958,6 +1976,8 @@ struct ImGuiContext
ImGuiViewportP* CurrentViewport; ImGuiViewportP* CurrentViewport;
ImGuiViewportP* MouseViewport; ImGuiViewportP* MouseViewport;
ImGuiViewportP* MouseLastHoveredViewport; ImGuiViewportP* MouseLastHoveredViewport;
ImGuiID PlatformLastFocusedViewportId;
ImGuiPlatformMonitor FallbackMonitor;
int ViewportFrontMostStampCount; int ViewportFrontMostStampCount;
ImGuiWindow* NavWindow; ImGuiWindow* NavWindow;
ImGuiID NavId; ImGuiID NavId;
@@ -2002,13 +2022,13 @@ struct ImGuiContext
float NavWindowingTimer; float NavWindowingTimer;
float NavWindowingHighlightAlpha; float NavWindowingHighlightAlpha;
bool NavWindowingToggleLayer; bool NavWindowingToggleLayer;
ImGuiWindow* FocusRequestCurrWindow; ImGuiWindow* TabFocusRequestCurrWindow;
ImGuiWindow* FocusRequestNextWindow; ImGuiWindow* TabFocusRequestNextWindow;
int FocusRequestCurrCounterRegular; int TabFocusRequestCurrCounterRegular;
int FocusRequestCurrCounterTabStop; int TabFocusRequestCurrCounterTabStop;
int FocusRequestNextCounterRegular; int TabFocusRequestNextCounterRegular;
int FocusRequestNextCounterTabStop; int TabFocusRequestNextCounterTabStop;
bool FocusTabPressed; bool TabFocusPressed;
float DimBgRatio; float DimBgRatio;
ImGuiMouseCursor MouseCursor; ImGuiMouseCursor MouseCursor;
bool DragDropActive; bool DragDropActive;
@@ -2068,10 +2088,13 @@ struct ImGuiContext
ImChunkStream_ImGuiWindowSettings SettingsWindows; ImChunkStream_ImGuiWindowSettings SettingsWindows;
ImChunkStream_ImGuiTableSettings SettingsTables; ImChunkStream_ImGuiTableSettings SettingsTables;
ImVector_ImGuiContextHook Hooks; ImVector_ImGuiContextHook Hooks;
ImGuiID HookIdNext;
bool LogEnabled; bool LogEnabled;
ImGuiLogType LogType; ImGuiLogType LogType;
ImFileHandle LogFile; ImFileHandle LogFile;
ImGuiTextBuffer LogBuffer; ImGuiTextBuffer LogBuffer;
const char* LogNextPrefix;
const char* LogNextSuffix;
float LogLinePosY; float LogLinePosY;
bool LogLineFirstItem; bool LogLineFirstItem;
int LogDepthRef; int LogDepthRef;
@@ -2184,6 +2207,7 @@ struct ImGuiWindow
ImS8 HiddenFramesCanSkipItems; ImS8 HiddenFramesCanSkipItems;
ImS8 HiddenFramesCannotSkipItems; ImS8 HiddenFramesCannotSkipItems;
ImS8 HiddenFramesForRenderOnly; ImS8 HiddenFramesForRenderOnly;
ImS8 DisableInputsFrames;
ImGuiCond SetWindowPosAllowFlags : 8; ImGuiCond SetWindowPosAllowFlags : 8;
ImGuiCond SetWindowSizeAllowFlags : 8; ImGuiCond SetWindowSizeAllowFlags : 8;
ImGuiCond SetWindowCollapsedAllowFlags : 8; ImGuiCond SetWindowCollapsedAllowFlags : 8;
@@ -2214,7 +2238,7 @@ struct ImGuiWindow
ImDrawList DrawListInst; ImDrawList DrawListInst;
ImGuiWindow* ParentWindow; ImGuiWindow* ParentWindow;
ImGuiWindow* RootWindow; ImGuiWindow* RootWindow;
ImGuiWindow* RootWindowDockStop; ImGuiWindow* RootWindowDockTree;
ImGuiWindow* RootWindowForTitleBarHighlight; ImGuiWindow* RootWindowForTitleBarHighlight;
ImGuiWindow* RootWindowForNav; ImGuiWindow* RootWindowForNav;
ImGuiWindow* NavLastChildNavWindow; ImGuiWindow* NavLastChildNavWindow;
@@ -2434,9 +2458,10 @@ struct ImGuiTable
ImGuiTableColumnIdx HeldHeaderColumn; ImGuiTableColumnIdx HeldHeaderColumn;
ImGuiTableColumnIdx ReorderColumn; ImGuiTableColumnIdx ReorderColumn;
ImGuiTableColumnIdx ReorderColumnDir; ImGuiTableColumnIdx ReorderColumnDir;
ImGuiTableColumnIdx LeftMostEnabledColumn;
ImGuiTableColumnIdx RightMostEnabledColumn;
ImGuiTableColumnIdx LeftMostStretchedColumn; ImGuiTableColumnIdx LeftMostStretchedColumn;
ImGuiTableColumnIdx RightMostStretchedColumn; ImGuiTableColumnIdx RightMostStretchedColumn;
ImGuiTableColumnIdx RightMostEnabledColumn;
ImGuiTableColumnIdx ContextPopupColumn; ImGuiTableColumnIdx ContextPopupColumn;
ImGuiTableColumnIdx FreezeRowsRequest; ImGuiTableColumnIdx FreezeRowsRequest;
ImGuiTableColumnIdx FreezeRowsCount; ImGuiTableColumnIdx FreezeRowsCount;
@@ -2482,6 +2507,10 @@ struct ImGuiTableSettings
ImGuiTableColumnIdx ColumnsCountMax; ImGuiTableColumnIdx ColumnsCountMax;
bool WantApply; bool WantApply;
}; };
struct ImFontBuilderIO
{
bool (*FontBuilder_Build)(ImFontAtlas* atlas);
};
#define IMGUI_HAS_DOCK 1 #define IMGUI_HAS_DOCK 1
#else #else
@@ -2583,11 +2612,11 @@ CIMGUI_API bool igIsWindowFocused(ImGuiFocusedFlags flags);
CIMGUI_API bool igIsWindowHovered(ImGuiHoveredFlags flags); CIMGUI_API bool igIsWindowHovered(ImGuiHoveredFlags flags);
CIMGUI_API ImDrawList* igGetWindowDrawList(void); CIMGUI_API ImDrawList* igGetWindowDrawList(void);
CIMGUI_API float igGetWindowDpiScale(void); CIMGUI_API float igGetWindowDpiScale(void);
CIMGUI_API ImGuiViewport* igGetWindowViewport(void);
CIMGUI_API void igGetWindowPos(ImVec2 *pOut); CIMGUI_API void igGetWindowPos(ImVec2 *pOut);
CIMGUI_API void igGetWindowSize(ImVec2 *pOut); CIMGUI_API void igGetWindowSize(ImVec2 *pOut);
CIMGUI_API float igGetWindowWidth(void); CIMGUI_API float igGetWindowWidth(void);
CIMGUI_API float igGetWindowHeight(void); CIMGUI_API float igGetWindowHeight(void);
CIMGUI_API ImGuiViewport* igGetWindowViewport(void);
CIMGUI_API void igSetNextWindowPos(const ImVec2 pos,ImGuiCond cond,const ImVec2 pivot); CIMGUI_API void igSetNextWindowPos(const ImVec2 pos,ImGuiCond cond,const ImVec2 pivot);
CIMGUI_API void igSetNextWindowSize(const ImVec2 size,ImGuiCond cond); CIMGUI_API void igSetNextWindowSize(const ImVec2 size,ImGuiCond cond);
CIMGUI_API void igSetNextWindowSizeConstraints(const ImVec2 size_min,const ImVec2 size_max,ImGuiSizeCallback custom_callback,void* custom_callback_data); CIMGUI_API void igSetNextWindowSizeConstraints(const ImVec2 size_min,const ImVec2 size_max,ImGuiSizeCallback custom_callback,void* custom_callback_data);
@@ -2772,11 +2801,10 @@ CIMGUI_API bool igCollapsingHeaderBoolPtr(const char* label,bool* p_visible,ImGu
CIMGUI_API void igSetNextItemOpen(bool is_open,ImGuiCond cond); CIMGUI_API void igSetNextItemOpen(bool is_open,ImGuiCond cond);
CIMGUI_API bool igSelectableBool(const char* label,bool selected,ImGuiSelectableFlags flags,const ImVec2 size); CIMGUI_API bool igSelectableBool(const char* label,bool selected,ImGuiSelectableFlags flags,const ImVec2 size);
CIMGUI_API bool igSelectableBoolPtr(const char* label,bool* p_selected,ImGuiSelectableFlags flags,const ImVec2 size); CIMGUI_API bool igSelectableBoolPtr(const char* label,bool* p_selected,ImGuiSelectableFlags flags,const ImVec2 size);
CIMGUI_API bool igBeginListBox(const char* label,const ImVec2 size);
CIMGUI_API void igEndListBox(void);
CIMGUI_API bool igListBoxStr_arr(const char* label,int* current_item,const char* const items[],int items_count,int height_in_items); CIMGUI_API bool igListBoxStr_arr(const char* label,int* current_item,const char* const items[],int items_count,int height_in_items);
CIMGUI_API bool igListBoxFnBoolPtr(const char* label,int* current_item,bool(*items_getter)(void* data,int idx,const char** out_text),void* data,int items_count,int height_in_items); CIMGUI_API bool igListBoxFnBoolPtr(const char* label,int* current_item,bool(*items_getter)(void* data,int idx,const char** out_text),void* data,int items_count,int height_in_items);
CIMGUI_API bool igListBoxHeaderVec2(const char* label,const ImVec2 size);
CIMGUI_API bool igListBoxHeaderInt(const char* label,int items_count,int height_in_items);
CIMGUI_API void igListBoxFooter(void);
CIMGUI_API void igPlotLinesFloatPtr(const char* label,const float* values,int values_count,int values_offset,const char* overlay_text,float scale_min,float scale_max,ImVec2 graph_size,int stride); CIMGUI_API void igPlotLinesFloatPtr(const char* label,const float* values,int values_count,int values_offset,const char* overlay_text,float scale_min,float scale_max,ImVec2 graph_size,int stride);
CIMGUI_API void igPlotLinesFnFloatPtr(const char* label,float(*values_getter)(void* data,int idx),void* data,int values_count,int values_offset,const char* overlay_text,float scale_min,float scale_max,ImVec2 graph_size); CIMGUI_API void igPlotLinesFnFloatPtr(const char* label,float(*values_getter)(void* data,int idx),void* data,int values_count,int values_offset,const char* overlay_text,float scale_min,float scale_max,ImVec2 graph_size);
CIMGUI_API void igPlotHistogramFloatPtr(const char* label,const float* values,int values_count,int values_offset,const char* overlay_text,float scale_min,float scale_max,ImVec2 graph_size,int stride); CIMGUI_API void igPlotHistogramFloatPtr(const char* label,const float* values,int values_count,int values_offset,const char* overlay_text,float scale_min,float scale_max,ImVec2 graph_size,int stride);
@@ -2812,7 +2840,7 @@ CIMGUI_API void igEndTable(void);
CIMGUI_API void igTableNextRow(ImGuiTableRowFlags row_flags,float min_row_height); CIMGUI_API void igTableNextRow(ImGuiTableRowFlags row_flags,float min_row_height);
CIMGUI_API bool igTableNextColumn(void); CIMGUI_API bool igTableNextColumn(void);
CIMGUI_API bool igTableSetColumnIndex(int column_n); CIMGUI_API bool igTableSetColumnIndex(int column_n);
CIMGUI_API void igTableSetupColumn(const char* label,ImGuiTableColumnFlags flags,float init_width_or_weight,ImU32 user_id); CIMGUI_API void igTableSetupColumn(const char* label,ImGuiTableColumnFlags flags,float init_width_or_weight,ImGuiID user_id);
CIMGUI_API void igTableSetupScrollFreeze(int cols,int rows); CIMGUI_API void igTableSetupScrollFreeze(int cols,int rows);
CIMGUI_API void igTableHeadersRow(void); CIMGUI_API void igTableHeadersRow(void);
CIMGUI_API void igTableHeader(const char* label); CIMGUI_API void igTableHeader(const char* label);
@@ -2838,7 +2866,7 @@ CIMGUI_API void igEndTabItem(void);
CIMGUI_API bool igTabItemButton(const char* label,ImGuiTabItemFlags flags); CIMGUI_API bool igTabItemButton(const char* label,ImGuiTabItemFlags flags);
CIMGUI_API void igSetTabItemClosed(const char* tab_or_docked_window_label); CIMGUI_API void igSetTabItemClosed(const char* tab_or_docked_window_label);
CIMGUI_API void igDockSpace(ImGuiID id,const ImVec2 size,ImGuiDockNodeFlags flags,const ImGuiWindowClass* window_class); CIMGUI_API void igDockSpace(ImGuiID id,const ImVec2 size,ImGuiDockNodeFlags flags,const ImGuiWindowClass* window_class);
CIMGUI_API ImGuiID igDockSpaceOverViewport(ImGuiViewport* viewport,ImGuiDockNodeFlags flags,const ImGuiWindowClass* window_class); CIMGUI_API ImGuiID igDockSpaceOverViewport(const ImGuiViewport* viewport,ImGuiDockNodeFlags flags,const ImGuiWindowClass* window_class);
CIMGUI_API void igSetNextWindowDockID(ImGuiID dock_id,ImGuiCond cond); CIMGUI_API void igSetNextWindowDockID(ImGuiID dock_id,ImGuiCond cond);
CIMGUI_API void igSetNextWindowClass(const ImGuiWindowClass* window_class); CIMGUI_API void igSetNextWindowClass(const ImGuiWindowClass* window_class);
CIMGUI_API ImGuiID igGetWindowDockID(void); CIMGUI_API ImGuiID igGetWindowDockID(void);
@@ -2848,6 +2876,7 @@ CIMGUI_API void igLogToFile(int auto_open_depth,const char* filename);
CIMGUI_API void igLogToClipboard(int auto_open_depth); CIMGUI_API void igLogToClipboard(int auto_open_depth);
CIMGUI_API void igLogFinish(void); CIMGUI_API void igLogFinish(void);
CIMGUI_API void igLogButtons(void); CIMGUI_API void igLogButtons(void);
CIMGUI_API void igLogTextV(const char* fmt,va_list args);
CIMGUI_API bool igBeginDragDropSource(ImGuiDragDropFlags flags); CIMGUI_API bool igBeginDragDropSource(ImGuiDragDropFlags flags);
CIMGUI_API bool igSetDragDropPayload(const char* type,const void* data,size_t sz,ImGuiCond cond); CIMGUI_API bool igSetDragDropPayload(const char* type,const void* data,size_t sz,ImGuiCond cond);
CIMGUI_API void igEndDragDropSource(void); CIMGUI_API void igEndDragDropSource(void);
@@ -2876,6 +2905,7 @@ CIMGUI_API void igGetItemRectMin(ImVec2 *pOut);
CIMGUI_API void igGetItemRectMax(ImVec2 *pOut); CIMGUI_API void igGetItemRectMax(ImVec2 *pOut);
CIMGUI_API void igGetItemRectSize(ImVec2 *pOut); CIMGUI_API void igGetItemRectSize(ImVec2 *pOut);
CIMGUI_API void igSetItemAllowOverlap(void); CIMGUI_API void igSetItemAllowOverlap(void);
CIMGUI_API ImGuiViewport* igGetMainViewport(void);
CIMGUI_API bool igIsRectVisibleNil(const ImVec2 size); CIMGUI_API bool igIsRectVisibleNil(const ImVec2 size);
CIMGUI_API bool igIsRectVisibleVec2(const ImVec2 rect_min,const ImVec2 rect_max); CIMGUI_API bool igIsRectVisibleVec2(const ImVec2 rect_min,const ImVec2 rect_max);
CIMGUI_API double igGetTime(void); CIMGUI_API double igGetTime(void);
@@ -2924,11 +2954,11 @@ CIMGUI_API void igLoadIniSettingsFromMemory(const char* ini_data,size_t ini_size
CIMGUI_API void igSaveIniSettingsToDisk(const char* ini_filename); CIMGUI_API void igSaveIniSettingsToDisk(const char* ini_filename);
CIMGUI_API const char* igSaveIniSettingsToMemory(size_t* out_ini_size); CIMGUI_API const char* igSaveIniSettingsToMemory(size_t* out_ini_size);
CIMGUI_API bool igDebugCheckVersionAndDataLayout(const char* version_str,size_t sz_io,size_t sz_style,size_t sz_vec2,size_t sz_vec4,size_t sz_drawvert,size_t sz_drawidx); CIMGUI_API bool igDebugCheckVersionAndDataLayout(const char* version_str,size_t sz_io,size_t sz_style,size_t sz_vec2,size_t sz_vec4,size_t sz_drawvert,size_t sz_drawidx);
CIMGUI_API void igSetAllocatorFunctions(void*(*alloc_func)(size_t sz,void* user_data),void(*free_func)(void* ptr,void* user_data),void* user_data); CIMGUI_API void igSetAllocatorFunctions(ImGuiMemAllocFunc alloc_func,ImGuiMemFreeFunc free_func,void* user_data);
CIMGUI_API void igGetAllocatorFunctions(ImGuiMemAllocFunc* p_alloc_func,ImGuiMemFreeFunc* p_free_func,void** p_user_data);
CIMGUI_API void* igMemAlloc(size_t size); CIMGUI_API void* igMemAlloc(size_t size);
CIMGUI_API void igMemFree(void* ptr); CIMGUI_API void igMemFree(void* ptr);
CIMGUI_API ImGuiPlatformIO* igGetPlatformIO(void); CIMGUI_API ImGuiPlatformIO* igGetPlatformIO(void);
CIMGUI_API ImGuiViewport* igGetMainViewport(void);
CIMGUI_API void igUpdatePlatformWindows(void); CIMGUI_API void igUpdatePlatformWindows(void);
CIMGUI_API void igRenderPlatformWindowsDefault(void* platform_render_arg,void* renderer_render_arg); CIMGUI_API void igRenderPlatformWindowsDefault(void* platform_render_arg,void* renderer_render_arg);
CIMGUI_API void igDestroyPlatformWindows(void); CIMGUI_API void igDestroyPlatformWindows(void);
@@ -3038,8 +3068,8 @@ CIMGUI_API void ImDrawList_PopTextureID(ImDrawList* self);
CIMGUI_API void ImDrawList_GetClipRectMin(ImVec2 *pOut,ImDrawList* self); CIMGUI_API void ImDrawList_GetClipRectMin(ImVec2 *pOut,ImDrawList* self);
CIMGUI_API void ImDrawList_GetClipRectMax(ImVec2 *pOut,ImDrawList* self); CIMGUI_API void ImDrawList_GetClipRectMax(ImVec2 *pOut,ImDrawList* self);
CIMGUI_API void ImDrawList_AddLine(ImDrawList* self,const ImVec2 p1,const ImVec2 p2,ImU32 col,float thickness); CIMGUI_API void ImDrawList_AddLine(ImDrawList* self,const ImVec2 p1,const ImVec2 p2,ImU32 col,float thickness);
CIMGUI_API void ImDrawList_AddRect(ImDrawList* self,const ImVec2 p_min,const ImVec2 p_max,ImU32 col,float rounding,ImDrawCornerFlags rounding_corners,float thickness); CIMGUI_API void ImDrawList_AddRect(ImDrawList* self,const ImVec2 p_min,const ImVec2 p_max,ImU32 col,float rounding,ImDrawFlags flags,float thickness);
CIMGUI_API void ImDrawList_AddRectFilled(ImDrawList* self,const ImVec2 p_min,const ImVec2 p_max,ImU32 col,float rounding,ImDrawCornerFlags rounding_corners); CIMGUI_API void ImDrawList_AddRectFilled(ImDrawList* self,const ImVec2 p_min,const ImVec2 p_max,ImU32 col,float rounding,ImDrawFlags flags);
CIMGUI_API void ImDrawList_AddRectFilledMultiColor(ImDrawList* self,const ImVec2 p_min,const ImVec2 p_max,ImU32 col_upr_left,ImU32 col_upr_right,ImU32 col_bot_right,ImU32 col_bot_left); CIMGUI_API void ImDrawList_AddRectFilledMultiColor(ImDrawList* self,const ImVec2 p_min,const ImVec2 p_max,ImU32 col_upr_left,ImU32 col_upr_right,ImU32 col_bot_right,ImU32 col_bot_left);
CIMGUI_API void ImDrawList_AddQuad(ImDrawList* self,const ImVec2 p1,const ImVec2 p2,const ImVec2 p3,const ImVec2 p4,ImU32 col,float thickness); CIMGUI_API void ImDrawList_AddQuad(ImDrawList* self,const ImVec2 p1,const ImVec2 p2,const ImVec2 p3,const ImVec2 p4,ImU32 col,float thickness);
CIMGUI_API void ImDrawList_AddQuadFilled(ImDrawList* self,const ImVec2 p1,const ImVec2 p2,const ImVec2 p3,const ImVec2 p4,ImU32 col); CIMGUI_API void ImDrawList_AddQuadFilled(ImDrawList* self,const ImVec2 p1,const ImVec2 p2,const ImVec2 p3,const ImVec2 p4,ImU32 col);
@@ -3051,23 +3081,23 @@ CIMGUI_API void ImDrawList_AddNgon(ImDrawList* self,const ImVec2 center,float ra
CIMGUI_API void ImDrawList_AddNgonFilled(ImDrawList* self,const ImVec2 center,float radius,ImU32 col,int num_segments); CIMGUI_API void ImDrawList_AddNgonFilled(ImDrawList* self,const ImVec2 center,float radius,ImU32 col,int num_segments);
CIMGUI_API void ImDrawList_AddTextVec2(ImDrawList* self,const ImVec2 pos,ImU32 col,const char* text_begin,const char* text_end); CIMGUI_API void ImDrawList_AddTextVec2(ImDrawList* self,const ImVec2 pos,ImU32 col,const char* text_begin,const char* text_end);
CIMGUI_API void ImDrawList_AddTextFontPtr(ImDrawList* self,const ImFont* font,float font_size,const ImVec2 pos,ImU32 col,const char* text_begin,const char* text_end,float wrap_width,const ImVec4* cpu_fine_clip_rect); CIMGUI_API void ImDrawList_AddTextFontPtr(ImDrawList* self,const ImFont* font,float font_size,const ImVec2 pos,ImU32 col,const char* text_begin,const char* text_end,float wrap_width,const ImVec4* cpu_fine_clip_rect);
CIMGUI_API void ImDrawList_AddPolyline(ImDrawList* self,const ImVec2* points,int num_points,ImU32 col,bool closed,float thickness); CIMGUI_API void ImDrawList_AddPolyline(ImDrawList* self,const ImVec2* points,int num_points,ImU32 col,ImDrawFlags flags,float thickness);
CIMGUI_API void ImDrawList_AddConvexPolyFilled(ImDrawList* self,const ImVec2* points,int num_points,ImU32 col); CIMGUI_API void ImDrawList_AddConvexPolyFilled(ImDrawList* self,const ImVec2* points,int num_points,ImU32 col);
CIMGUI_API void ImDrawList_AddBezierCubic(ImDrawList* self,const ImVec2 p1,const ImVec2 p2,const ImVec2 p3,const ImVec2 p4,ImU32 col,float thickness,int num_segments); CIMGUI_API void ImDrawList_AddBezierCubic(ImDrawList* self,const ImVec2 p1,const ImVec2 p2,const ImVec2 p3,const ImVec2 p4,ImU32 col,float thickness,int num_segments);
CIMGUI_API void ImDrawList_AddBezierQuadratic(ImDrawList* self,const ImVec2 p1,const ImVec2 p2,const ImVec2 p3,ImU32 col,float thickness,int num_segments); CIMGUI_API void ImDrawList_AddBezierQuadratic(ImDrawList* self,const ImVec2 p1,const ImVec2 p2,const ImVec2 p3,ImU32 col,float thickness,int num_segments);
CIMGUI_API void ImDrawList_AddImage(ImDrawList* self,ImTextureID user_texture_id,const ImVec2 p_min,const ImVec2 p_max,const ImVec2 uv_min,const ImVec2 uv_max,ImU32 col); CIMGUI_API void ImDrawList_AddImage(ImDrawList* self,ImTextureID user_texture_id,const ImVec2 p_min,const ImVec2 p_max,const ImVec2 uv_min,const ImVec2 uv_max,ImU32 col);
CIMGUI_API void ImDrawList_AddImageQuad(ImDrawList* self,ImTextureID user_texture_id,const ImVec2 p1,const ImVec2 p2,const ImVec2 p3,const ImVec2 p4,const ImVec2 uv1,const ImVec2 uv2,const ImVec2 uv3,const ImVec2 uv4,ImU32 col); CIMGUI_API void ImDrawList_AddImageQuad(ImDrawList* self,ImTextureID user_texture_id,const ImVec2 p1,const ImVec2 p2,const ImVec2 p3,const ImVec2 p4,const ImVec2 uv1,const ImVec2 uv2,const ImVec2 uv3,const ImVec2 uv4,ImU32 col);
CIMGUI_API void ImDrawList_AddImageRounded(ImDrawList* self,ImTextureID user_texture_id,const ImVec2 p_min,const ImVec2 p_max,const ImVec2 uv_min,const ImVec2 uv_max,ImU32 col,float rounding,ImDrawCornerFlags rounding_corners); CIMGUI_API void ImDrawList_AddImageRounded(ImDrawList* self,ImTextureID user_texture_id,const ImVec2 p_min,const ImVec2 p_max,const ImVec2 uv_min,const ImVec2 uv_max,ImU32 col,float rounding,ImDrawFlags flags);
CIMGUI_API void ImDrawList_PathClear(ImDrawList* self); CIMGUI_API void ImDrawList_PathClear(ImDrawList* self);
CIMGUI_API void ImDrawList_PathLineTo(ImDrawList* self,const ImVec2 pos); CIMGUI_API void ImDrawList_PathLineTo(ImDrawList* self,const ImVec2 pos);
CIMGUI_API void ImDrawList_PathLineToMergeDuplicate(ImDrawList* self,const ImVec2 pos); CIMGUI_API void ImDrawList_PathLineToMergeDuplicate(ImDrawList* self,const ImVec2 pos);
CIMGUI_API void ImDrawList_PathFillConvex(ImDrawList* self,ImU32 col); CIMGUI_API void ImDrawList_PathFillConvex(ImDrawList* self,ImU32 col);
CIMGUI_API void ImDrawList_PathStroke(ImDrawList* self,ImU32 col,bool closed,float thickness); CIMGUI_API void ImDrawList_PathStroke(ImDrawList* self,ImU32 col,ImDrawFlags flags,float thickness);
CIMGUI_API void ImDrawList_PathArcTo(ImDrawList* self,const ImVec2 center,float radius,float a_min,float a_max,int num_segments); CIMGUI_API void ImDrawList_PathArcTo(ImDrawList* self,const ImVec2 center,float radius,float a_min,float a_max,int num_segments);
CIMGUI_API void ImDrawList_PathArcToFast(ImDrawList* self,const ImVec2 center,float radius,int a_min_of_12,int a_max_of_12); CIMGUI_API void ImDrawList_PathArcToFast(ImDrawList* self,const ImVec2 center,float radius,int a_min_of_12,int a_max_of_12);
CIMGUI_API void ImDrawList_PathBezierCubicCurveTo(ImDrawList* self,const ImVec2 p2,const ImVec2 p3,const ImVec2 p4,int num_segments); CIMGUI_API void ImDrawList_PathBezierCubicCurveTo(ImDrawList* self,const ImVec2 p2,const ImVec2 p3,const ImVec2 p4,int num_segments);
CIMGUI_API void ImDrawList_PathBezierQuadraticCurveTo(ImDrawList* self,const ImVec2 p2,const ImVec2 p3,int num_segments); CIMGUI_API void ImDrawList_PathBezierQuadraticCurveTo(ImDrawList* self,const ImVec2 p2,const ImVec2 p3,int num_segments);
CIMGUI_API void ImDrawList_PathRect(ImDrawList* self,const ImVec2 rect_min,const ImVec2 rect_max,float rounding,ImDrawCornerFlags rounding_corners); CIMGUI_API void ImDrawList_PathRect(ImDrawList* self,const ImVec2 rect_min,const ImVec2 rect_max,float rounding,ImDrawFlags flags);
CIMGUI_API void ImDrawList_AddCallback(ImDrawList* self,ImDrawCallback callback,void* callback_data); CIMGUI_API void ImDrawList_AddCallback(ImDrawList* self,ImDrawCallback callback,void* callback_data);
CIMGUI_API void ImDrawList_AddDrawCmd(ImDrawList* self); CIMGUI_API void ImDrawList_AddDrawCmd(ImDrawList* self);
CIMGUI_API ImDrawList* ImDrawList_CloneOutput(ImDrawList* self); CIMGUI_API ImDrawList* ImDrawList_CloneOutput(ImDrawList* self);
@@ -3088,6 +3118,9 @@ CIMGUI_API void ImDrawList__PopUnusedDrawCmd(ImDrawList* self);
CIMGUI_API void ImDrawList__OnChangedClipRect(ImDrawList* self); CIMGUI_API void ImDrawList__OnChangedClipRect(ImDrawList* self);
CIMGUI_API void ImDrawList__OnChangedTextureID(ImDrawList* self); CIMGUI_API void ImDrawList__OnChangedTextureID(ImDrawList* self);
CIMGUI_API void ImDrawList__OnChangedVtxOffset(ImDrawList* self); CIMGUI_API void ImDrawList__OnChangedVtxOffset(ImDrawList* self);
CIMGUI_API int ImDrawList__CalcCircleAutoSegmentCount(ImDrawList* self,float radius);
CIMGUI_API void ImDrawList__PathArcToFastEx(ImDrawList* self,const ImVec2 center,float radius,int a_min_sample,int a_max_sample,int a_step);
CIMGUI_API void ImDrawList__PathArcToN(ImDrawList* self,const ImVec2 center,float radius,float a_min,float a_max,int num_segments);
CIMGUI_API ImDrawData* ImDrawData_ImDrawData(void); CIMGUI_API ImDrawData* ImDrawData_ImDrawData(void);
CIMGUI_API void ImDrawData_destroy(ImDrawData* self); CIMGUI_API void ImDrawData_destroy(ImDrawData* self);
CIMGUI_API void ImDrawData_Clear(ImDrawData* self); CIMGUI_API void ImDrawData_Clear(ImDrawData* self);
@@ -3156,15 +3189,14 @@ CIMGUI_API void ImFont_AddRemapChar(ImFont* self,ImWchar dst,ImWchar src,bool ov
CIMGUI_API void ImFont_SetGlyphVisible(ImFont* self,ImWchar c,bool visible); CIMGUI_API void ImFont_SetGlyphVisible(ImFont* self,ImWchar c,bool visible);
CIMGUI_API void ImFont_SetFallbackChar(ImFont* self,ImWchar c); CIMGUI_API void ImFont_SetFallbackChar(ImFont* self,ImWchar c);
CIMGUI_API bool ImFont_IsGlyphRangeUnused(ImFont* self,unsigned int c_begin,unsigned int c_last); CIMGUI_API bool ImFont_IsGlyphRangeUnused(ImFont* self,unsigned int c_begin,unsigned int c_last);
CIMGUI_API ImGuiViewport* ImGuiViewport_ImGuiViewport(void);
CIMGUI_API void ImGuiViewport_destroy(ImGuiViewport* self);
CIMGUI_API void ImGuiViewport_GetCenter(ImVec2 *pOut,ImGuiViewport* self);
CIMGUI_API void ImGuiViewport_GetWorkCenter(ImVec2 *pOut,ImGuiViewport* self);
CIMGUI_API ImGuiPlatformIO* ImGuiPlatformIO_ImGuiPlatformIO(void); CIMGUI_API ImGuiPlatformIO* ImGuiPlatformIO_ImGuiPlatformIO(void);
CIMGUI_API void ImGuiPlatformIO_destroy(ImGuiPlatformIO* self); CIMGUI_API void ImGuiPlatformIO_destroy(ImGuiPlatformIO* self);
CIMGUI_API ImGuiPlatformMonitor* ImGuiPlatformMonitor_ImGuiPlatformMonitor(void); CIMGUI_API ImGuiPlatformMonitor* ImGuiPlatformMonitor_ImGuiPlatformMonitor(void);
CIMGUI_API void ImGuiPlatformMonitor_destroy(ImGuiPlatformMonitor* self); CIMGUI_API void ImGuiPlatformMonitor_destroy(ImGuiPlatformMonitor* self);
CIMGUI_API ImGuiViewport* ImGuiViewport_ImGuiViewport(void);
CIMGUI_API void ImGuiViewport_destroy(ImGuiViewport* self);
CIMGUI_API void ImGuiViewport_GetCenter(ImVec2 *pOut,ImGuiViewport* self);
CIMGUI_API void ImGuiViewport_GetWorkPos(ImVec2 *pOut,ImGuiViewport* self);
CIMGUI_API void ImGuiViewport_GetWorkSize(ImVec2 *pOut,ImGuiViewport* self);
CIMGUI_API ImGuiID igImHashData(const void* data,size_t data_size,ImU32 seed); CIMGUI_API ImGuiID igImHashData(const void* data,size_t data_size,ImU32 seed);
CIMGUI_API ImGuiID igImHashStr(const char* data,size_t data_size,ImU32 seed); CIMGUI_API ImGuiID igImHashStr(const char* data,size_t data_size,ImU32 seed);
CIMGUI_API ImU32 igImAlphaBlendColors(ImU32 col_a,ImU32 col_b); CIMGUI_API ImU32 igImAlphaBlendColors(ImU32 col_a,ImU32 col_b);
@@ -3254,6 +3286,7 @@ CIMGUI_API void ImRect_GetCenter(ImVec2 *pOut,ImRect* self);
CIMGUI_API void ImRect_GetSize(ImVec2 *pOut,ImRect* self); CIMGUI_API void ImRect_GetSize(ImVec2 *pOut,ImRect* self);
CIMGUI_API float ImRect_GetWidth(ImRect* self); CIMGUI_API float ImRect_GetWidth(ImRect* self);
CIMGUI_API float ImRect_GetHeight(ImRect* self); CIMGUI_API float ImRect_GetHeight(ImRect* self);
CIMGUI_API float ImRect_GetArea(ImRect* self);
CIMGUI_API void ImRect_GetTL(ImVec2 *pOut,ImRect* self); CIMGUI_API void ImRect_GetTL(ImVec2 *pOut,ImRect* self);
CIMGUI_API void ImRect_GetTR(ImVec2 *pOut,ImRect* self); CIMGUI_API void ImRect_GetTR(ImVec2 *pOut,ImRect* self);
CIMGUI_API void ImRect_GetBL(ImVec2 *pOut,ImRect* self); CIMGUI_API void ImRect_GetBL(ImVec2 *pOut,ImRect* self);
@@ -3284,9 +3317,10 @@ CIMGUI_API void ImBitVector_SetBit(ImBitVector* self,int n);
CIMGUI_API void ImBitVector_ClearBit(ImBitVector* self,int n); CIMGUI_API void ImBitVector_ClearBit(ImBitVector* self,int n);
CIMGUI_API ImDrawListSharedData* ImDrawListSharedData_ImDrawListSharedData(void); CIMGUI_API ImDrawListSharedData* ImDrawListSharedData_ImDrawListSharedData(void);
CIMGUI_API void ImDrawListSharedData_destroy(ImDrawListSharedData* self); CIMGUI_API void ImDrawListSharedData_destroy(ImDrawListSharedData* self);
CIMGUI_API void ImDrawListSharedData_SetCircleSegmentMaxError(ImDrawListSharedData* self,float max_error); CIMGUI_API void ImDrawListSharedData_SetCircleTessellationMaxError(ImDrawListSharedData* self,float max_error);
CIMGUI_API void ImDrawDataBuilder_Clear(ImDrawDataBuilder* self); CIMGUI_API void ImDrawDataBuilder_Clear(ImDrawDataBuilder* self);
CIMGUI_API void ImDrawDataBuilder_ClearFreeMemory(ImDrawDataBuilder* self); CIMGUI_API void ImDrawDataBuilder_ClearFreeMemory(ImDrawDataBuilder* self);
CIMGUI_API int ImDrawDataBuilder_GetDrawListCount(ImDrawDataBuilder* self);
CIMGUI_API void ImDrawDataBuilder_FlattenIntoSingleLayer(ImDrawDataBuilder* self); CIMGUI_API void ImDrawDataBuilder_FlattenIntoSingleLayer(ImDrawDataBuilder* self);
CIMGUI_API ImGuiStyleMod* ImGuiStyleMod_ImGuiStyleModInt(ImGuiStyleVar idx,int v); CIMGUI_API ImGuiStyleMod* ImGuiStyleMod_ImGuiStyleModInt(ImGuiStyleVar idx,int v);
CIMGUI_API void ImGuiStyleMod_destroy(ImGuiStyleMod* self); CIMGUI_API void ImGuiStyleMod_destroy(ImGuiStyleMod* self);
@@ -3346,6 +3380,7 @@ CIMGUI_API ImGuiViewportP* ImGuiViewportP_ImGuiViewportP(void);
CIMGUI_API void ImGuiViewportP_destroy(ImGuiViewportP* self); CIMGUI_API void ImGuiViewportP_destroy(ImGuiViewportP* self);
CIMGUI_API void ImGuiViewportP_GetMainRect(ImRect *pOut,ImGuiViewportP* self); CIMGUI_API void ImGuiViewportP_GetMainRect(ImRect *pOut,ImGuiViewportP* self);
CIMGUI_API void ImGuiViewportP_GetWorkRect(ImRect *pOut,ImGuiViewportP* self); CIMGUI_API void ImGuiViewportP_GetWorkRect(ImRect *pOut,ImGuiViewportP* self);
CIMGUI_API void ImGuiViewportP_UpdateWorkRect(ImGuiViewportP* self);
CIMGUI_API void ImGuiViewportP_ClearRequestFlags(ImGuiViewportP* self); CIMGUI_API void ImGuiViewportP_ClearRequestFlags(ImGuiViewportP* self);
CIMGUI_API ImGuiWindowSettings* ImGuiWindowSettings_ImGuiWindowSettings(void); CIMGUI_API ImGuiWindowSettings* ImGuiWindowSettings_ImGuiWindowSettings(void);
CIMGUI_API void ImGuiWindowSettings_destroy(ImGuiWindowSettings* self); CIMGUI_API void ImGuiWindowSettings_destroy(ImGuiWindowSettings* self);
@@ -3425,11 +3460,13 @@ CIMGUI_API void igStartMouseMovingWindow(ImGuiWindow* window);
CIMGUI_API void igStartMouseMovingWindowOrNode(ImGuiWindow* window,ImGuiDockNode* node,bool undock_floating_node); CIMGUI_API void igStartMouseMovingWindowOrNode(ImGuiWindow* window,ImGuiDockNode* node,bool undock_floating_node);
CIMGUI_API void igUpdateMouseMovingWindowNewFrame(void); CIMGUI_API void igUpdateMouseMovingWindowNewFrame(void);
CIMGUI_API void igUpdateMouseMovingWindowEndFrame(void); CIMGUI_API void igUpdateMouseMovingWindowEndFrame(void);
CIMGUI_API void igAddContextHook(ImGuiContext* context,const ImGuiContextHook* hook); CIMGUI_API ImGuiID igAddContextHook(ImGuiContext* context,const ImGuiContextHook* hook);
CIMGUI_API void igRemoveContextHook(ImGuiContext* context,ImGuiID hook_to_remove);
CIMGUI_API void igCallContextHooks(ImGuiContext* context,ImGuiContextHookType type); CIMGUI_API void igCallContextHooks(ImGuiContext* context,ImGuiContextHookType type);
CIMGUI_API void igTranslateWindowsInViewport(ImGuiViewportP* viewport,const ImVec2 old_pos,const ImVec2 new_pos); CIMGUI_API void igTranslateWindowsInViewport(ImGuiViewportP* viewport,const ImVec2 old_pos,const ImVec2 new_pos);
CIMGUI_API void igScaleWindowsInViewport(ImGuiViewportP* viewport,float scale); CIMGUI_API void igScaleWindowsInViewport(ImGuiViewportP* viewport,float scale);
CIMGUI_API void igDestroyPlatformWindow(ImGuiViewportP* viewport); CIMGUI_API void igDestroyPlatformWindow(ImGuiViewportP* viewport);
CIMGUI_API const ImGuiPlatformMonitor* igGetViewportPlatformMonitor(ImGuiViewport* viewport);
CIMGUI_API void igMarkIniSettingsDirtyNil(void); CIMGUI_API void igMarkIniSettingsDirtyNil(void);
CIMGUI_API void igMarkIniSettingsDirtyWindowPtr(ImGuiWindow* window); CIMGUI_API void igMarkIniSettingsDirtyWindowPtr(ImGuiWindow* window);
CIMGUI_API void igClearIniSettings(void); CIMGUI_API void igClearIniSettings(void);
@@ -3475,6 +3512,8 @@ CIMGUI_API void igGetContentRegionMaxAbs(ImVec2 *pOut);
CIMGUI_API void igShrinkWidths(ImGuiShrinkWidthItem* items,int count,float width_excess); CIMGUI_API void igShrinkWidths(ImGuiShrinkWidthItem* items,int count,float width_excess);
CIMGUI_API void igLogBegin(ImGuiLogType type,int auto_open_depth); CIMGUI_API void igLogBegin(ImGuiLogType type,int auto_open_depth);
CIMGUI_API void igLogToBuffer(int auto_open_depth); CIMGUI_API void igLogToBuffer(int auto_open_depth);
CIMGUI_API void igLogRenderedText(const ImVec2* ref_pos,const char* text,const char* text_end);
CIMGUI_API void igLogSetNextTextDecoration(const char* prefix,const char* suffix);
CIMGUI_API bool igBeginChildEx(const char* name,ImGuiID id,const ImVec2 size_arg,bool border,ImGuiWindowFlags flags); CIMGUI_API bool igBeginChildEx(const char* name,ImGuiID id,const ImVec2 size_arg,bool border,ImGuiWindowFlags flags);
CIMGUI_API void igOpenPopupEx(ImGuiID id,ImGuiPopupFlags popup_flags); CIMGUI_API void igOpenPopupEx(ImGuiID id,ImGuiPopupFlags popup_flags);
CIMGUI_API void igClosePopupToLevel(int remaining,bool restore_focus_to_window_under_popup); CIMGUI_API void igClosePopupToLevel(int remaining,bool restore_focus_to_window_under_popup);
@@ -3494,8 +3533,7 @@ CIMGUI_API float igGetNavInputAmount(ImGuiNavInput n,ImGuiInputReadMode mode);
CIMGUI_API void igGetNavInputAmount2d(ImVec2 *pOut,ImGuiNavDirSourceFlags dir_sources,ImGuiInputReadMode mode,float slow_factor,float fast_factor); CIMGUI_API void igGetNavInputAmount2d(ImVec2 *pOut,ImGuiNavDirSourceFlags dir_sources,ImGuiInputReadMode mode,float slow_factor,float fast_factor);
CIMGUI_API int igCalcTypematicRepeatAmount(float t0,float t1,float repeat_delay,float repeat_rate); CIMGUI_API int igCalcTypematicRepeatAmount(float t0,float t1,float repeat_delay,float repeat_rate);
CIMGUI_API void igActivateItem(ImGuiID id); CIMGUI_API void igActivateItem(ImGuiID id);
CIMGUI_API void igSetNavID(ImGuiID id,int nav_layer,ImGuiID focus_scope_id); CIMGUI_API void igSetNavID(ImGuiID id,int nav_layer,ImGuiID focus_scope_id,const ImRect rect_rel);
CIMGUI_API void igSetNavIDWithRectRel(ImGuiID id,int nav_layer,ImGuiID focus_scope_id,const ImRect rect_rel);
CIMGUI_API void igPushFocusScope(ImGuiID id); CIMGUI_API void igPushFocusScope(ImGuiID id);
CIMGUI_API void igPopFocusScope(void); CIMGUI_API void igPopFocusScope(void);
CIMGUI_API ImGuiID igGetFocusedFocusScope(void); CIMGUI_API ImGuiID igGetFocusedFocusScope(void);
@@ -3558,12 +3596,14 @@ CIMGUI_API ImGuiOldColumns* igFindOrCreateColumns(ImGuiWindow* window,ImGuiID id
CIMGUI_API float igGetColumnOffsetFromNorm(const ImGuiOldColumns* columns,float offset_norm); CIMGUI_API float igGetColumnOffsetFromNorm(const ImGuiOldColumns* columns,float offset_norm);
CIMGUI_API float igGetColumnNormFromOffset(const ImGuiOldColumns* columns,float offset); CIMGUI_API float igGetColumnNormFromOffset(const ImGuiOldColumns* columns,float offset);
CIMGUI_API void igTableOpenContextMenu(int column_n); CIMGUI_API void igTableOpenContextMenu(int column_n);
CIMGUI_API void igTableSetColumnEnabled(int column_n,bool enabled);
CIMGUI_API void igTableSetColumnWidth(int column_n,float width); CIMGUI_API void igTableSetColumnWidth(int column_n,float width);
CIMGUI_API void igTableSetColumnSortDirection(int column_n,ImGuiSortDirection sort_direction,bool append_to_sort_specs); CIMGUI_API void igTableSetColumnSortDirection(int column_n,ImGuiSortDirection sort_direction,bool append_to_sort_specs);
CIMGUI_API int igTableGetHoveredColumn(void); CIMGUI_API int igTableGetHoveredColumn(void);
CIMGUI_API float igTableGetHeaderRowHeight(void); CIMGUI_API float igTableGetHeaderRowHeight(void);
CIMGUI_API void igTablePushBackgroundChannel(void); CIMGUI_API void igTablePushBackgroundChannel(void);
CIMGUI_API void igTablePopBackgroundChannel(void); CIMGUI_API void igTablePopBackgroundChannel(void);
CIMGUI_API ImGuiTable* igGetCurrentTable(void);
CIMGUI_API ImGuiTable* igTableFindByID(ImGuiID id); CIMGUI_API ImGuiTable* igTableFindByID(ImGuiID id);
CIMGUI_API bool igBeginTableEx(const char* name,ImGuiID id,int columns_count,ImGuiTableFlags flags,const ImVec2 outer_size,float inner_width); CIMGUI_API bool igBeginTableEx(const char* name,ImGuiID id,int columns_count,ImGuiTableFlags flags,const ImVec2 outer_size,float inner_width);
CIMGUI_API void igTableBeginInitMemory(ImGuiTable* table,int columns_count); CIMGUI_API void igTableBeginInitMemory(ImGuiTable* table,int columns_count);
@@ -3619,10 +3659,9 @@ CIMGUI_API void igRenderTextClippedEx(ImDrawList* draw_list,const ImVec2 pos_min
CIMGUI_API void igRenderTextEllipsis(ImDrawList* draw_list,const ImVec2 pos_min,const ImVec2 pos_max,float clip_max_x,float ellipsis_max_x,const char* text,const char* text_end,const ImVec2* text_size_if_known); CIMGUI_API void igRenderTextEllipsis(ImDrawList* draw_list,const ImVec2 pos_min,const ImVec2 pos_max,float clip_max_x,float ellipsis_max_x,const char* text,const char* text_end,const ImVec2* text_size_if_known);
CIMGUI_API void igRenderFrame(ImVec2 p_min,ImVec2 p_max,ImU32 fill_col,bool border,float rounding); CIMGUI_API void igRenderFrame(ImVec2 p_min,ImVec2 p_max,ImU32 fill_col,bool border,float rounding);
CIMGUI_API void igRenderFrameBorder(ImVec2 p_min,ImVec2 p_max,float rounding); CIMGUI_API void igRenderFrameBorder(ImVec2 p_min,ImVec2 p_max,float rounding);
CIMGUI_API void igRenderColorRectWithAlphaCheckerboard(ImDrawList* draw_list,ImVec2 p_min,ImVec2 p_max,ImU32 fill_col,float grid_step,ImVec2 grid_off,float rounding,int rounding_corners_flags); CIMGUI_API void igRenderColorRectWithAlphaCheckerboard(ImDrawList* draw_list,ImVec2 p_min,ImVec2 p_max,ImU32 fill_col,float grid_step,ImVec2 grid_off,float rounding,ImDrawFlags flags);
CIMGUI_API void igRenderNavHighlight(const ImRect bb,ImGuiID id,ImGuiNavHighlightFlags flags); CIMGUI_API void igRenderNavHighlight(const ImRect bb,ImGuiID id,ImGuiNavHighlightFlags flags);
CIMGUI_API const char* igFindRenderedTextEnd(const char* text,const char* text_end); CIMGUI_API const char* igFindRenderedTextEnd(const char* text,const char* text_end);
CIMGUI_API void igLogRenderedText(const ImVec2* ref_pos,const char* text,const char* text_end);
CIMGUI_API void igRenderArrow(ImDrawList* draw_list,ImVec2 pos,ImU32 col,ImGuiDir dir,float scale); CIMGUI_API void igRenderArrow(ImDrawList* draw_list,ImVec2 pos,ImU32 col,ImGuiDir dir,float scale);
CIMGUI_API void igRenderBullet(ImDrawList* draw_list,ImVec2 pos,ImU32 col); CIMGUI_API void igRenderBullet(ImDrawList* draw_list,ImVec2 pos,ImU32 col);
CIMGUI_API void igRenderCheckMark(ImDrawList* draw_list,ImVec2 pos,ImU32 col,float sz); CIMGUI_API void igRenderCheckMark(ImDrawList* draw_list,ImVec2 pos,ImU32 col,float sz);
@@ -3637,7 +3676,7 @@ CIMGUI_API bool igCloseButton(ImGuiID id,const ImVec2 pos);
CIMGUI_API bool igCollapseButton(ImGuiID id,const ImVec2 pos,ImGuiDockNode* dock_node); CIMGUI_API bool igCollapseButton(ImGuiID id,const ImVec2 pos,ImGuiDockNode* dock_node);
CIMGUI_API bool igArrowButtonEx(const char* str_id,ImGuiDir dir,ImVec2 size_arg,ImGuiButtonFlags flags); CIMGUI_API bool igArrowButtonEx(const char* str_id,ImGuiDir dir,ImVec2 size_arg,ImGuiButtonFlags flags);
CIMGUI_API void igScrollbar(ImGuiAxis axis); CIMGUI_API void igScrollbar(ImGuiAxis axis);
CIMGUI_API bool igScrollbarEx(const ImRect bb,ImGuiID id,ImGuiAxis axis,float* p_scroll_v,float avail_v,float contents_v,ImDrawCornerFlags rounding_corners); CIMGUI_API bool igScrollbarEx(const ImRect bb,ImGuiID id,ImGuiAxis axis,float* p_scroll_v,float avail_v,float contents_v,ImDrawFlags flags);
CIMGUI_API bool igImageButtonEx(ImGuiID id,ImTextureID texture_id,const ImVec2 size,const ImVec2 uv0,const ImVec2 uv1,const ImVec2 padding,const ImVec4 bg_col,const ImVec4 tint_col); CIMGUI_API bool igImageButtonEx(ImGuiID id,ImTextureID texture_id,const ImVec2 size,const ImVec2 uv0,const ImVec2 uv1,const ImVec2 padding,const ImVec4 bg_col,const ImVec4 tint_col);
CIMGUI_API void igGetWindowScrollbarRect(ImRect *pOut,ImGuiWindow* window,ImGuiAxis axis); CIMGUI_API void igGetWindowScrollbarRect(ImRect *pOut,ImGuiWindow* window,ImGuiAxis axis);
CIMGUI_API ImGuiID igGetWindowScrollbarID(ImGuiWindow* window,ImGuiAxis axis); CIMGUI_API ImGuiID igGetWindowScrollbarID(ImGuiWindow* window,ImGuiAxis axis);
@@ -3687,12 +3726,14 @@ CIMGUI_API void igDebugNodeWindow(ImGuiWindow* window,const char* label);
CIMGUI_API void igDebugNodeWindowSettings(ImGuiWindowSettings* settings); CIMGUI_API void igDebugNodeWindowSettings(ImGuiWindowSettings* settings);
CIMGUI_API void igDebugNodeWindowsList(ImVector_ImGuiWindowPtr* windows,const char* label); CIMGUI_API void igDebugNodeWindowsList(ImVector_ImGuiWindowPtr* windows,const char* label);
CIMGUI_API void igDebugNodeViewport(ImGuiViewportP* viewport); CIMGUI_API void igDebugNodeViewport(ImGuiViewportP* viewport);
CIMGUI_API bool igImFontAtlasBuildWithStbTruetype(ImFontAtlas* atlas); CIMGUI_API void igDebugRenderViewportThumbnail(ImDrawList* draw_list,ImGuiViewportP* viewport,const ImRect bb);
CIMGUI_API const ImFontBuilderIO* igImFontAtlasGetBuilderForStbTruetype(void);
CIMGUI_API void igImFontAtlasBuildInit(ImFontAtlas* atlas); CIMGUI_API void igImFontAtlasBuildInit(ImFontAtlas* atlas);
CIMGUI_API void igImFontAtlasBuildSetupFont(ImFontAtlas* atlas,ImFont* font,ImFontConfig* font_config,float ascent,float descent); CIMGUI_API void igImFontAtlasBuildSetupFont(ImFontAtlas* atlas,ImFont* font,ImFontConfig* font_config,float ascent,float descent);
CIMGUI_API void igImFontAtlasBuildPackCustomRects(ImFontAtlas* atlas,void* stbrp_context_opaque); CIMGUI_API void igImFontAtlasBuildPackCustomRects(ImFontAtlas* atlas,void* stbrp_context_opaque);
CIMGUI_API void igImFontAtlasBuildFinish(ImFontAtlas* atlas); CIMGUI_API void igImFontAtlasBuildFinish(ImFontAtlas* atlas);
CIMGUI_API void igImFontAtlasBuildRender1bppRectFromString(ImFontAtlas* atlas,int atlas_x,int atlas_y,int w,int h,const char* in_str,char in_marker_char,unsigned char in_marker_pixel_value); CIMGUI_API void igImFontAtlasBuildRender8bppRectFromString(ImFontAtlas* atlas,int x,int y,int w,int h,const char* in_str,char in_marker_char,unsigned char in_marker_pixel_value);
CIMGUI_API void igImFontAtlasBuildRender32bppRectFromString(ImFontAtlas* atlas,int x,int y,int w,int h,const char* in_str,char in_marker_char,unsigned int in_marker_pixel_value);
CIMGUI_API void igImFontAtlasBuildMultiplyCalcLookupTable(unsigned char out_table[256],float in_multiply_factor); CIMGUI_API void igImFontAtlasBuildMultiplyCalcLookupTable(unsigned char out_table[256],float in_multiply_factor);
CIMGUI_API void igImFontAtlasBuildMultiplyRectAlpha8(const unsigned char table[256],unsigned char* pixels,int x,int y,int w,int h,int stride); CIMGUI_API void igImFontAtlasBuildMultiplyRectAlpha8(const unsigned char table[256],unsigned char* pixels,int x,int y,int w,int h,int stride);

View File

@@ -165,8 +165,11 @@ local function parse_enum_value(value, allenums,dontpost)
--already in allenums --already in allenums
if allenums[clean(value)] then return allenums[clean(value)] end if allenums[clean(value)] then return allenums[clean(value)] end
--must be several and operators --must be several and operators
--precedence order (hope not ()) ------------precedence order (hope not ())
assert(not value:match("[%(%)]")) --first drop outer ()
value = value:gsub("^(%()",""):gsub("(%))$","")
assert(not value:match("[%(%)]"),value)
local several,seps = strsplit(value,"([<>&|~%+]+)") local several,seps = strsplit(value,"([<>&|~%+]+)")
--M.prtable(value,several,seps) --M.prtable(value,several,seps)
assert(#seps+1==#several) assert(#seps+1==#several)
@@ -182,6 +185,9 @@ local function parse_enum_value(value, allenums,dontpost)
local val2 = clean(several[i+1]) local val2 = clean(several[i+1])
if allenums[val1] then val1 = allenums[val1] end if allenums[val1] then val1 = allenums[val1] end
if allenums[val2] then val2 = allenums[val2] end if allenums[val2] then val2 = allenums[val2] end
--clean 1u
if type(val1)=="string" then val1 = val1:gsub("(%d)(u)$","%1") end
if type(val2)=="string" then val2 = val2:gsub("(%d)(u)$","%1") end
--for getting numbers from "1ULL" --for getting numbers from "1ULL"
if type(val1)=="string" then val1 = loadstring("return "..val1)() end if type(val1)=="string" then val1 = loadstring("return "..val1)() end
if type(val2)=="string" then val2 = loadstring("return "..val2)() end if type(val2)=="string" then val2 = loadstring("return "..val2)() end
@@ -281,7 +287,7 @@ local function getRE()
typedef_re = "^\n*%s*(typedef[^;]+;)", typedef_re = "^\n*%s*(typedef[^;]+;)",
typedef_st_re = "^\n*(typedef%s+struct%s*%b{}.-;)", typedef_st_re = "^\n*(typedef%s+struct%s*%b{}.-;)",
functypedef_re = "^\n*%s*(typedef[%w%s%*_]+%(%s*%*%s*[%w_]+%s*%)%s*%b()%s*;)", functypedef_re = "^\n*%s*(typedef[%w%s%*_]+%(%s*%*%s*[%w_]+%s*%)%s*%b()%s*;)",
functypedef_re = "^\n*%s*(typedef[%w%s%*_]+%([^*]*%*%s*[%w_]+%s*%)%s*%b()%s*;)", functypedef_re = "^\n*%s*(typedef[%w%s%*_]+%([^*]*%*?%s*[%w_]+%s*%)%s*%b()%s*;)",
--vardef_re = "^\n*([^;{}%(%)]+;)", --vardef_re = "^\n*([^;{}%(%)]+;)",
--change for things as --change for things as
--[[ImU8 Used4kPagesMap[((sizeof(ImWchar16) == 2 ? 0xFFFF : 0x10FFFF)+1)/4096/8];]] --[[ImU8 Used4kPagesMap[((sizeof(ImWchar16) == 2 ? 0xFFFF : 0x10FFFF)+1)/4096/8];]]
@@ -414,14 +420,13 @@ local function parseItems(txt,linenumdict, itparent, dumpit)
end end
M.parseItems = parseItems M.parseItems = parseItems
local function name_overloadsAlgo(v) local function name_overloadsAlgo(v)
local aa = {} local aa = {}
local bb = {} local bb = {}
local done = {} local done = {}
local maxnum = 0 local maxnum = 0
for i,t in ipairs(v) do for i,t in ipairs(v) do
bb[i] = "" bb[i] = ""
--local signature = t.signature:sub(2,-2) -- without parenthesis
--inside parenthesis
local signature = t.signature:match("%b()") local signature = t.signature:match("%b()")
signature = signature:sub(2,-2) signature = signature:sub(2,-2)
--add const function --add const function
@@ -430,47 +435,52 @@ local function name_overloadsAlgo(v)
end end
aa[i] = {} aa[i] = {}
local num = 1 local num = 1
--for typec in t.signature:gmatch(".-([^,%(%s]+)[,%)]") do
--for typec in t.signature:gmatch(".-([^,%(]+)[,%)]") do
--for typec in signature:gmatch(".-([^,]+),?") do
for typec in signature:gsub("(%(.-%))", function(x) return x:gsub(",","\0") end):gmatch(".-([^,]+),?") do for typec in signature:gsub("(%(.-%))", function(x) return x:gsub(",","\0") end):gmatch(".-([^,]+),?") do
--typec = typec:gsub
aa[i][num] = typec:gsub("%z+", ",") aa[i][num] = typec:gsub("%z+", ",")
num = num + 1 num = num + 1
end end
num = num - 1 num = num - 1
maxnum = (num > maxnum) and num or maxnum maxnum = (num > maxnum) and num or maxnum
end end
for l=1,maxnum do for l=1,maxnum do
local keys = {} local keys = {}
local diferent = true local diferent = true
local equal = true local equal = true
for i=1,#v do for i=1,#v do
aa[i][l] = aa[i][l] or "nil" aa[i][l] = aa[i][l] or "nil"
keys[aa[i][l]] = 1 + (aa[i][l] and keys[aa[i][l]] or 0) keys[aa[i][l]] = 1 + (keys[aa[i][l]] or 0)
if not done[i] then if not done[i] then
for j=i+1,#v do for j=i+1,#v do
if not done[j] then if not done[j] then
if aa[i][l] == aa[j][l] then if aa[i][l] == aa[j][l] then
diferent = false diferent = false
else else
equal = false equal = false
end
end
end end
end
end
end end
end end
if not equal then -- not all the same if not equal then -- not all the same
for i=1,#v do for i=1,#v do
if not done[i] then if not done[i] then
bb[i] = bb[i]..(aa[i][l]=="nil" and "" or aa[i][l]) bb[i] = bb[i]..(aa[i][l]=="nil" and "" or aa[i][l])
if keys[aa[i][l]] == 1 then -- if keys[aa[i][l]] == 1 then
done[i] = true -- done[i] = true
end -- end
end end
end end
end end
--test done
for i=1,#v do
done[i] = true
for j=1,#v do
if i~=j and bb[i]==bb[j] then
done[i] = false
end
end
end
end end
--avoid empty postfix which will be reserved to generic --avoid empty postfix which will be reserved to generic
for i,v in ipairs(bb) do if v=="" then bb[i]="Nil" end end for i,v in ipairs(bb) do if v=="" then bb[i]="Nil" end end
@@ -493,6 +503,7 @@ local function typetoStr(typ)
typ = typ:gsub("float","Float") typ = typ:gsub("float","Float")
typ = typ:gsub("uInt","Uint") typ = typ:gsub("uInt","Uint")
typ = typ:gsub("ImGui","") typ = typ:gsub("ImGui","")
--typ = typ:gsub("ImStr","STR")
typ = typ:gsub("Im","") typ = typ:gsub("Im","")
typ = typ:gsub("[<>]","") typ = typ:gsub("[<>]","")
return typ return typ
@@ -769,6 +780,84 @@ local function AdjustArguments(FP)
end end
end end
end end
local function ADDIMSTR_S(FP)
local defsT = FP.defsT
local newcdefs = {}
for numcdef,t in ipairs(FP.funcdefs) do
newcdefs[#newcdefs+1] = t
if t.cimguiname then
local cimf = defsT[t.cimguiname]
local defT = cimf[t.signature]
--if isIMSTR return generate _S version
local isIMSTR = false
for i,arg in ipairs(defT.argsT) do
if arg.type == "ImStrv" then isIMSTR=true;break end
end
--if defT.ret=="ImVec2" or defT.ret=="ImVec4" or defT.ret=="ImColor" then
--if isIMSTR then print(t.cimguiname,defT.ov_cimguiname,defT.argsoriginal,"isIMSTR") end
if isIMSTR then
--passing as a pointer arg
local defT2 = {}
--first strings
for k,v in pairs(defT) do
defT2[k] = v
end
--then argsT table
defT2.argsT = {}
for k,v in ipairs(defT.argsT) do
local typ = v.type == "ImStrv" and "const char*" or v.type
table.insert(defT2.argsT,{type=typ,name=v.name})
end
--defaults table
defT2.defaults = {}
for k,v in pairs(defT.defaults) do
defT2.defaults[k] = v
end
defT2.args = defT2.args:gsub("ImStrv","const char*")
--recreate call_args for wrapping into ImStrv
local caar
if #defT.argsT > 0 then
caar = "("
for i,v in ipairs(defT.argsT) do
local name = v.name
if v.ret then --function pointer
caar = caar .. name .. ","
else
local callname = v.reftoptr and "*"..name or name
caar = caar .. callname .. ","
end
end
caar = caar:sub(1,-2)..")"
else
caar = "()"
end
defT2.call_args = caar
------------------
defT2.signature = defT.signature:gsub("ImStrv","const char*") --.."_S"
defT2.ov_cimguiname = defT2.ov_cimguiname .. "_Strv"
defT2.isIMSTR_S = 1
-- check there is not an equal version in imgui_stname
local doadd = true
for i,dd in ipairs(cimf) do
if dd.signature == defT2.signature then
doadd = false;
print("skip _S addition",defT2.cimguiname)
break
end
end
--add _S version
if doadd then
cimf[#cimf+1] = defT2
cimf[defT2.signature] = defT2
newcdefs[#newcdefs+1] = {stname=t.stname,funcname=t.funcname,args=defT2.args,signature=defT2.signature,cimguiname=defT2.cimguiname,ret =defT2.ret}
end
end
else print("not cimguiname in");M.prtable(t)
end
end
FP.funcdefs = newcdefs
end
local function ADDnonUDT(FP) local function ADDnonUDT(FP)
local defsT = FP.defsT local defsT = FP.defsT
--local newcdefs = {} --local newcdefs = {}
@@ -995,16 +1084,25 @@ function M.Parser()
local value,key = line:match("typedef%s+(.+)%s+([%w_]+);") local value,key = line:match("typedef%s+(.+)%s+([%w_]+);")
if key and value then if key and value then
self.typedefs_dict[key] = value self.typedefs_dict[key] = value
else --try function typedef else --try function pointer typedef
local key = line:match("%(%*([%w_]+)%)%([^%(%)]*%)") local key = line:match("%(%*([%w_]+)%)%([^%(%)]*%)")
if key then if key then
local linet = line local linet = line
linet = linet:gsub("typedef ","") linet = linet:gsub("typedef ","")
linet = linet:gsub("%(%*("..key..")%)","(*)") linet = linet:gsub("%(%*("..key..")%)","(*)")
self.typedefs_dict[key] = linet self.typedefs_dict[key] = linet
elseif not line:match"typedef%s*struct" then --discard typedef struct else
print("typedef not found") --try function typedef
print(key,value,line) key = line:match("%(([%w_]+)%)%([^%(%)]*%)")
if key then
local linet = line
linet = linet:gsub("typedef ","")
linet = linet:gsub("%(("..key..")%)","()")
self.typedefs_dict[key] = linet
elseif not line:match"typedef%s*struct" then --discard typedef struct
print("typedef not found")
print(key,value,line)
end
end end
end end
end end
@@ -1491,6 +1589,7 @@ function M.Parser()
for k,v in pairs(self.alltypes) do print(k, typetoStr(k) ) end for k,v in pairs(self.alltypes) do print(k, typetoStr(k) ) end
end end
function par:compute_overloads() function par:compute_overloads()
--ADDIMSTR_S(self)
local strt = {} local strt = {}
local numoverloaded = 0 local numoverloaded = 0
self.alltypes = {} self.alltypes = {}
@@ -1506,8 +1605,15 @@ function M.Parser()
for i,t in ipairs(v) do for i,t in ipairs(v) do
--take overloaded name from manual table or algorythm --take overloaded name from manual table or algorythm
t.ov_cimguiname = self.getCname_overload(t.stname,t.funcname,t.signature,t.namespace) or k..typetoStr(post[i]) t.ov_cimguiname = self.getCname_overload(t.stname,t.funcname,t.signature,t.namespace) or k..typetoStr(post[i])
--check ...
if( t.ov_cimguiname:match"%.%.%.") then
print("... in ov",t.ov_cimguiname)
for i,dd in ipairs(v) do
print(dd.signature,post[i])
end
error"Bad check ..."
end
table.insert(strt,string.format("%d\t%s\t%s %s",i,t.ret,t.ov_cimguiname,t.signature)) table.insert(strt,string.format("%d\t%s\t%s %s",i,t.ret,t.ov_cimguiname,t.signature))
--M.prtable(typesc[i],post)
end end
--check not two names are equal (produced by bad cimguiname_overload) --check not two names are equal (produced by bad cimguiname_overload)
for i=1,#v-1 do for i=1,#v-1 do
@@ -1525,8 +1631,10 @@ function M.Parser()
end) end)
--print(numoverloaded, "overloaded") --print(numoverloaded, "overloaded")
table.insert(strt,string.format("%d overloaded",numoverloaded)) table.insert(strt,string.format("%d overloaded",numoverloaded))
ADDIMSTR_S(self)
AdjustArguments(self) AdjustArguments(self)
ADDnonUDT(self) ADDnonUDT(self)
--ADDdestructors(self) --ADDdestructors(self)
self.overloadstxt = table.concat(strt,"\n") self.overloadstxt = table.concat(strt,"\n")
end end

View File

@@ -313,6 +313,9 @@ local function cimgui_generation(parser)
if gdefines.IMGUI_HAS_DOCK then if gdefines.IMGUI_HAS_DOCK then
cstructsstr = cstructsstr.."\n#define IMGUI_HAS_DOCK 1\n" cstructsstr = cstructsstr.."\n#define IMGUI_HAS_DOCK 1\n"
end end
if gdefines.IMGUI_HAS_IMSTR then
cstructsstr = cstructsstr.."\n#define IMGUI_HAS_IMSTR 1\n"
end
hstrfile = hstrfile:gsub([[#include "imgui_structs%.h"]],cstructsstr) hstrfile = hstrfile:gsub([[#include "imgui_structs%.h"]],cstructsstr)
local cfuncsstr = func_header_generate(parser) local cfuncsstr = func_header_generate(parser)
@@ -333,13 +336,13 @@ end
-------------------------------------------------------- --------------------------------------------------------
--get imgui.h version and IMGUI_HAS_DOCK-------------------------- --get imgui.h version and IMGUI_HAS_DOCK--------------------------
--get some defines wont work for cl ---------------- --get some defines wont work for cl ----------------
gdefines = get_defines{"IMGUI_VERSION","FLT_MAX","FLT_MIN","IMGUI_HAS_DOCK"} gdefines = get_defines{"IMGUI_VERSION","FLT_MAX","FLT_MIN","IMGUI_HAS_DOCK","IMGUI_HAS_IMSTR"}
--this will work for cl --this will work for cl
local pipe,err = io.open("../imgui/imgui.h","r") local pipe,err = io.open("../imgui/imgui.h","r")
if not pipe then if not pipe then
error("could not open file:"..err) error("could not open file:"..err)
end end
local imgui_version,has_dock local imgui_version,has_dock,has_imstr
while true do while true do
local line = pipe:read"*l" local line = pipe:read"*l"
if not line then break end if not line then break end
@@ -349,11 +352,15 @@ while true do
if not has_dock then if not has_dock then
has_dock = line:match([[#define%s+IMGUI_HAS_DOCK]])--%s*(".+")]]) has_dock = line:match([[#define%s+IMGUI_HAS_DOCK]])--%s*(".+")]])
end end
if imgui_version and has_dock then break end if not has_imstr then
has_imstr = line:match([[#define%s+IMGUI_HAS_IMSTR]])--%s*(".+")]])
end
if imgui_version and has_dock and has_imstr then break end
end end
pipe:close() pipe:close()
if has_dock then gdefines.IMGUI_HAS_DOCK = true end if has_dock then gdefines.IMGUI_HAS_DOCK = true end
if has_imstr then gdefines.IMGUI_HAS_IMSTR = true end
cimgui_header = cimgui_header:gsub("XXX",imgui_version) cimgui_header = cimgui_header:gsub("XXX",imgui_version)
if INTERNAL_GENERATION then if INTERNAL_GENERATION then
@@ -369,6 +376,7 @@ if gdefines.IMGUI_HAS_DOCK then
]] ]]
end end
print("IMGUI_HAS_IMSTR",gdefines.IMGUI_HAS_IMSTR)
print("IMGUI_HAS_DOCK",gdefines.IMGUI_HAS_DOCK) print("IMGUI_HAS_DOCK",gdefines.IMGUI_HAS_DOCK)
print("IMGUI_VERSION",imgui_version) print("IMGUI_VERSION",imgui_version)

View File

@@ -8,6 +8,7 @@ struct GLFWmonitor;
struct SDL_Window; struct SDL_Window;
typedef union SDL_Event SDL_Event;CIMGUI_API bool ImGui_ImplGlfw_InitForOpenGL(GLFWwindow* window,bool install_callbacks); typedef union SDL_Event SDL_Event;CIMGUI_API bool ImGui_ImplGlfw_InitForOpenGL(GLFWwindow* window,bool install_callbacks);
CIMGUI_API bool ImGui_ImplGlfw_InitForVulkan(GLFWwindow* window,bool install_callbacks); CIMGUI_API bool ImGui_ImplGlfw_InitForVulkan(GLFWwindow* window,bool install_callbacks);
CIMGUI_API bool ImGui_ImplGlfw_InitForOther(GLFWwindow* window,bool install_callbacks);
CIMGUI_API void ImGui_ImplGlfw_Shutdown(); CIMGUI_API void ImGui_ImplGlfw_Shutdown();
CIMGUI_API void ImGui_ImplGlfw_NewFrame(); CIMGUI_API void ImGui_ImplGlfw_NewFrame();
CIMGUI_API void ImGui_ImplGlfw_MouseButtonCallback(GLFWwindow* window,int button,int action,int mods); CIMGUI_API void ImGui_ImplGlfw_MouseButtonCallback(GLFWwindow* window,int button,int action,int mods);

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@@ -17,7 +17,7 @@
"cimguiname": "ImGui_ImplGlfw_CharCallback", "cimguiname": "ImGui_ImplGlfw_CharCallback",
"defaults": {}, "defaults": {},
"funcname": "ImGui_ImplGlfw_CharCallback", "funcname": "ImGui_ImplGlfw_CharCallback",
"location": "imgui_impl_glfw:40", "location": "imgui_impl_glfw:41",
"ov_cimguiname": "ImGui_ImplGlfw_CharCallback", "ov_cimguiname": "ImGui_ImplGlfw_CharCallback",
"ret": "void", "ret": "void",
"signature": "(GLFWwindow*,unsigned int)", "signature": "(GLFWwindow*,unsigned int)",
@@ -49,6 +49,31 @@
"stname": "" "stname": ""
} }
], ],
"ImGui_ImplGlfw_InitForOther": [
{
"args": "(GLFWwindow* window,bool install_callbacks)",
"argsT": [
{
"name": "window",
"type": "GLFWwindow*"
},
{
"name": "install_callbacks",
"type": "bool"
}
],
"argsoriginal": "(GLFWwindow* window,bool install_callbacks)",
"call_args": "(window,install_callbacks)",
"cimguiname": "ImGui_ImplGlfw_InitForOther",
"defaults": {},
"funcname": "ImGui_ImplGlfw_InitForOther",
"location": "imgui_impl_glfw:31",
"ov_cimguiname": "ImGui_ImplGlfw_InitForOther",
"ret": "bool",
"signature": "(GLFWwindow*,bool)",
"stname": ""
}
],
"ImGui_ImplGlfw_InitForVulkan": [ "ImGui_ImplGlfw_InitForVulkan": [
{ {
"args": "(GLFWwindow* window,bool install_callbacks)", "args": "(GLFWwindow* window,bool install_callbacks)",
@@ -104,7 +129,7 @@
"cimguiname": "ImGui_ImplGlfw_KeyCallback", "cimguiname": "ImGui_ImplGlfw_KeyCallback",
"defaults": {}, "defaults": {},
"funcname": "ImGui_ImplGlfw_KeyCallback", "funcname": "ImGui_ImplGlfw_KeyCallback",
"location": "imgui_impl_glfw:39", "location": "imgui_impl_glfw:40",
"ov_cimguiname": "ImGui_ImplGlfw_KeyCallback", "ov_cimguiname": "ImGui_ImplGlfw_KeyCallback",
"ret": "void", "ret": "void",
"signature": "(GLFWwindow*,int,int,int,int)", "signature": "(GLFWwindow*,int,int,int,int)",
@@ -129,7 +154,7 @@
"cimguiname": "ImGui_ImplGlfw_MonitorCallback", "cimguiname": "ImGui_ImplGlfw_MonitorCallback",
"defaults": {}, "defaults": {},
"funcname": "ImGui_ImplGlfw_MonitorCallback", "funcname": "ImGui_ImplGlfw_MonitorCallback",
"location": "imgui_impl_glfw:41", "location": "imgui_impl_glfw:42",
"ov_cimguiname": "ImGui_ImplGlfw_MonitorCallback", "ov_cimguiname": "ImGui_ImplGlfw_MonitorCallback",
"ret": "void", "ret": "void",
"signature": "(GLFWmonitor*,int)", "signature": "(GLFWmonitor*,int)",
@@ -162,7 +187,7 @@
"cimguiname": "ImGui_ImplGlfw_MouseButtonCallback", "cimguiname": "ImGui_ImplGlfw_MouseButtonCallback",
"defaults": {}, "defaults": {},
"funcname": "ImGui_ImplGlfw_MouseButtonCallback", "funcname": "ImGui_ImplGlfw_MouseButtonCallback",
"location": "imgui_impl_glfw:37", "location": "imgui_impl_glfw:38",
"ov_cimguiname": "ImGui_ImplGlfw_MouseButtonCallback", "ov_cimguiname": "ImGui_ImplGlfw_MouseButtonCallback",
"ret": "void", "ret": "void",
"signature": "(GLFWwindow*,int,int,int)", "signature": "(GLFWwindow*,int,int,int)",
@@ -178,7 +203,7 @@
"cimguiname": "ImGui_ImplGlfw_NewFrame", "cimguiname": "ImGui_ImplGlfw_NewFrame",
"defaults": {}, "defaults": {},
"funcname": "ImGui_ImplGlfw_NewFrame", "funcname": "ImGui_ImplGlfw_NewFrame",
"location": "imgui_impl_glfw:32", "location": "imgui_impl_glfw:33",
"ov_cimguiname": "ImGui_ImplGlfw_NewFrame", "ov_cimguiname": "ImGui_ImplGlfw_NewFrame",
"ret": "void", "ret": "void",
"signature": "()", "signature": "()",
@@ -207,7 +232,7 @@
"cimguiname": "ImGui_ImplGlfw_ScrollCallback", "cimguiname": "ImGui_ImplGlfw_ScrollCallback",
"defaults": {}, "defaults": {},
"funcname": "ImGui_ImplGlfw_ScrollCallback", "funcname": "ImGui_ImplGlfw_ScrollCallback",
"location": "imgui_impl_glfw:38", "location": "imgui_impl_glfw:39",
"ov_cimguiname": "ImGui_ImplGlfw_ScrollCallback", "ov_cimguiname": "ImGui_ImplGlfw_ScrollCallback",
"ret": "void", "ret": "void",
"signature": "(GLFWwindow*,double,double)", "signature": "(GLFWwindow*,double,double)",
@@ -223,7 +248,7 @@
"cimguiname": "ImGui_ImplGlfw_Shutdown", "cimguiname": "ImGui_ImplGlfw_Shutdown",
"defaults": {}, "defaults": {},
"funcname": "ImGui_ImplGlfw_Shutdown", "funcname": "ImGui_ImplGlfw_Shutdown",
"location": "imgui_impl_glfw:31", "location": "imgui_impl_glfw:32",
"ov_cimguiname": "ImGui_ImplGlfw_Shutdown", "ov_cimguiname": "ImGui_ImplGlfw_Shutdown",
"ret": "void", "ret": "void",
"signature": "()", "signature": "()",

View File

@@ -14,7 +14,7 @@ defs["ImGui_ImplGlfw_CharCallback"][1]["call_args"] = "(window,c)"
defs["ImGui_ImplGlfw_CharCallback"][1]["cimguiname"] = "ImGui_ImplGlfw_CharCallback" defs["ImGui_ImplGlfw_CharCallback"][1]["cimguiname"] = "ImGui_ImplGlfw_CharCallback"
defs["ImGui_ImplGlfw_CharCallback"][1]["defaults"] = {} defs["ImGui_ImplGlfw_CharCallback"][1]["defaults"] = {}
defs["ImGui_ImplGlfw_CharCallback"][1]["funcname"] = "ImGui_ImplGlfw_CharCallback" defs["ImGui_ImplGlfw_CharCallback"][1]["funcname"] = "ImGui_ImplGlfw_CharCallback"
defs["ImGui_ImplGlfw_CharCallback"][1]["location"] = "imgui_impl_glfw:40" defs["ImGui_ImplGlfw_CharCallback"][1]["location"] = "imgui_impl_glfw:41"
defs["ImGui_ImplGlfw_CharCallback"][1]["ov_cimguiname"] = "ImGui_ImplGlfw_CharCallback" defs["ImGui_ImplGlfw_CharCallback"][1]["ov_cimguiname"] = "ImGui_ImplGlfw_CharCallback"
defs["ImGui_ImplGlfw_CharCallback"][1]["ret"] = "void" defs["ImGui_ImplGlfw_CharCallback"][1]["ret"] = "void"
defs["ImGui_ImplGlfw_CharCallback"][1]["signature"] = "(GLFWwindow*,unsigned int)" defs["ImGui_ImplGlfw_CharCallback"][1]["signature"] = "(GLFWwindow*,unsigned int)"
@@ -41,6 +41,27 @@ defs["ImGui_ImplGlfw_InitForOpenGL"][1]["ret"] = "bool"
defs["ImGui_ImplGlfw_InitForOpenGL"][1]["signature"] = "(GLFWwindow*,bool)" defs["ImGui_ImplGlfw_InitForOpenGL"][1]["signature"] = "(GLFWwindow*,bool)"
defs["ImGui_ImplGlfw_InitForOpenGL"][1]["stname"] = "" defs["ImGui_ImplGlfw_InitForOpenGL"][1]["stname"] = ""
defs["ImGui_ImplGlfw_InitForOpenGL"]["(GLFWwindow*,bool)"] = defs["ImGui_ImplGlfw_InitForOpenGL"][1] defs["ImGui_ImplGlfw_InitForOpenGL"]["(GLFWwindow*,bool)"] = defs["ImGui_ImplGlfw_InitForOpenGL"][1]
defs["ImGui_ImplGlfw_InitForOther"] = {}
defs["ImGui_ImplGlfw_InitForOther"][1] = {}
defs["ImGui_ImplGlfw_InitForOther"][1]["args"] = "(GLFWwindow* window,bool install_callbacks)"
defs["ImGui_ImplGlfw_InitForOther"][1]["argsT"] = {}
defs["ImGui_ImplGlfw_InitForOther"][1]["argsT"][1] = {}
defs["ImGui_ImplGlfw_InitForOther"][1]["argsT"][1]["name"] = "window"
defs["ImGui_ImplGlfw_InitForOther"][1]["argsT"][1]["type"] = "GLFWwindow*"
defs["ImGui_ImplGlfw_InitForOther"][1]["argsT"][2] = {}
defs["ImGui_ImplGlfw_InitForOther"][1]["argsT"][2]["name"] = "install_callbacks"
defs["ImGui_ImplGlfw_InitForOther"][1]["argsT"][2]["type"] = "bool"
defs["ImGui_ImplGlfw_InitForOther"][1]["argsoriginal"] = "(GLFWwindow* window,bool install_callbacks)"
defs["ImGui_ImplGlfw_InitForOther"][1]["call_args"] = "(window,install_callbacks)"
defs["ImGui_ImplGlfw_InitForOther"][1]["cimguiname"] = "ImGui_ImplGlfw_InitForOther"
defs["ImGui_ImplGlfw_InitForOther"][1]["defaults"] = {}
defs["ImGui_ImplGlfw_InitForOther"][1]["funcname"] = "ImGui_ImplGlfw_InitForOther"
defs["ImGui_ImplGlfw_InitForOther"][1]["location"] = "imgui_impl_glfw:31"
defs["ImGui_ImplGlfw_InitForOther"][1]["ov_cimguiname"] = "ImGui_ImplGlfw_InitForOther"
defs["ImGui_ImplGlfw_InitForOther"][1]["ret"] = "bool"
defs["ImGui_ImplGlfw_InitForOther"][1]["signature"] = "(GLFWwindow*,bool)"
defs["ImGui_ImplGlfw_InitForOther"][1]["stname"] = ""
defs["ImGui_ImplGlfw_InitForOther"]["(GLFWwindow*,bool)"] = defs["ImGui_ImplGlfw_InitForOther"][1]
defs["ImGui_ImplGlfw_InitForVulkan"] = {} defs["ImGui_ImplGlfw_InitForVulkan"] = {}
defs["ImGui_ImplGlfw_InitForVulkan"][1] = {} defs["ImGui_ImplGlfw_InitForVulkan"][1] = {}
defs["ImGui_ImplGlfw_InitForVulkan"][1]["args"] = "(GLFWwindow* window,bool install_callbacks)" defs["ImGui_ImplGlfw_InitForVulkan"][1]["args"] = "(GLFWwindow* window,bool install_callbacks)"
@@ -86,7 +107,7 @@ defs["ImGui_ImplGlfw_KeyCallback"][1]["call_args"] = "(window,key,scancode,actio
defs["ImGui_ImplGlfw_KeyCallback"][1]["cimguiname"] = "ImGui_ImplGlfw_KeyCallback" defs["ImGui_ImplGlfw_KeyCallback"][1]["cimguiname"] = "ImGui_ImplGlfw_KeyCallback"
defs["ImGui_ImplGlfw_KeyCallback"][1]["defaults"] = {} defs["ImGui_ImplGlfw_KeyCallback"][1]["defaults"] = {}
defs["ImGui_ImplGlfw_KeyCallback"][1]["funcname"] = "ImGui_ImplGlfw_KeyCallback" defs["ImGui_ImplGlfw_KeyCallback"][1]["funcname"] = "ImGui_ImplGlfw_KeyCallback"
defs["ImGui_ImplGlfw_KeyCallback"][1]["location"] = "imgui_impl_glfw:39" defs["ImGui_ImplGlfw_KeyCallback"][1]["location"] = "imgui_impl_glfw:40"
defs["ImGui_ImplGlfw_KeyCallback"][1]["ov_cimguiname"] = "ImGui_ImplGlfw_KeyCallback" defs["ImGui_ImplGlfw_KeyCallback"][1]["ov_cimguiname"] = "ImGui_ImplGlfw_KeyCallback"
defs["ImGui_ImplGlfw_KeyCallback"][1]["ret"] = "void" defs["ImGui_ImplGlfw_KeyCallback"][1]["ret"] = "void"
defs["ImGui_ImplGlfw_KeyCallback"][1]["signature"] = "(GLFWwindow*,int,int,int,int)" defs["ImGui_ImplGlfw_KeyCallback"][1]["signature"] = "(GLFWwindow*,int,int,int,int)"
@@ -107,7 +128,7 @@ defs["ImGui_ImplGlfw_MonitorCallback"][1]["call_args"] = "(monitor,event)"
defs["ImGui_ImplGlfw_MonitorCallback"][1]["cimguiname"] = "ImGui_ImplGlfw_MonitorCallback" defs["ImGui_ImplGlfw_MonitorCallback"][1]["cimguiname"] = "ImGui_ImplGlfw_MonitorCallback"
defs["ImGui_ImplGlfw_MonitorCallback"][1]["defaults"] = {} defs["ImGui_ImplGlfw_MonitorCallback"][1]["defaults"] = {}
defs["ImGui_ImplGlfw_MonitorCallback"][1]["funcname"] = "ImGui_ImplGlfw_MonitorCallback" defs["ImGui_ImplGlfw_MonitorCallback"][1]["funcname"] = "ImGui_ImplGlfw_MonitorCallback"
defs["ImGui_ImplGlfw_MonitorCallback"][1]["location"] = "imgui_impl_glfw:41" defs["ImGui_ImplGlfw_MonitorCallback"][1]["location"] = "imgui_impl_glfw:42"
defs["ImGui_ImplGlfw_MonitorCallback"][1]["ov_cimguiname"] = "ImGui_ImplGlfw_MonitorCallback" defs["ImGui_ImplGlfw_MonitorCallback"][1]["ov_cimguiname"] = "ImGui_ImplGlfw_MonitorCallback"
defs["ImGui_ImplGlfw_MonitorCallback"][1]["ret"] = "void" defs["ImGui_ImplGlfw_MonitorCallback"][1]["ret"] = "void"
defs["ImGui_ImplGlfw_MonitorCallback"][1]["signature"] = "(GLFWmonitor*,int)" defs["ImGui_ImplGlfw_MonitorCallback"][1]["signature"] = "(GLFWmonitor*,int)"
@@ -134,7 +155,7 @@ defs["ImGui_ImplGlfw_MouseButtonCallback"][1]["call_args"] = "(window,button,act
defs["ImGui_ImplGlfw_MouseButtonCallback"][1]["cimguiname"] = "ImGui_ImplGlfw_MouseButtonCallback" defs["ImGui_ImplGlfw_MouseButtonCallback"][1]["cimguiname"] = "ImGui_ImplGlfw_MouseButtonCallback"
defs["ImGui_ImplGlfw_MouseButtonCallback"][1]["defaults"] = {} defs["ImGui_ImplGlfw_MouseButtonCallback"][1]["defaults"] = {}
defs["ImGui_ImplGlfw_MouseButtonCallback"][1]["funcname"] = "ImGui_ImplGlfw_MouseButtonCallback" defs["ImGui_ImplGlfw_MouseButtonCallback"][1]["funcname"] = "ImGui_ImplGlfw_MouseButtonCallback"
defs["ImGui_ImplGlfw_MouseButtonCallback"][1]["location"] = "imgui_impl_glfw:37" defs["ImGui_ImplGlfw_MouseButtonCallback"][1]["location"] = "imgui_impl_glfw:38"
defs["ImGui_ImplGlfw_MouseButtonCallback"][1]["ov_cimguiname"] = "ImGui_ImplGlfw_MouseButtonCallback" defs["ImGui_ImplGlfw_MouseButtonCallback"][1]["ov_cimguiname"] = "ImGui_ImplGlfw_MouseButtonCallback"
defs["ImGui_ImplGlfw_MouseButtonCallback"][1]["ret"] = "void" defs["ImGui_ImplGlfw_MouseButtonCallback"][1]["ret"] = "void"
defs["ImGui_ImplGlfw_MouseButtonCallback"][1]["signature"] = "(GLFWwindow*,int,int,int)" defs["ImGui_ImplGlfw_MouseButtonCallback"][1]["signature"] = "(GLFWwindow*,int,int,int)"
@@ -149,7 +170,7 @@ defs["ImGui_ImplGlfw_NewFrame"][1]["call_args"] = "()"
defs["ImGui_ImplGlfw_NewFrame"][1]["cimguiname"] = "ImGui_ImplGlfw_NewFrame" defs["ImGui_ImplGlfw_NewFrame"][1]["cimguiname"] = "ImGui_ImplGlfw_NewFrame"
defs["ImGui_ImplGlfw_NewFrame"][1]["defaults"] = {} defs["ImGui_ImplGlfw_NewFrame"][1]["defaults"] = {}
defs["ImGui_ImplGlfw_NewFrame"][1]["funcname"] = "ImGui_ImplGlfw_NewFrame" defs["ImGui_ImplGlfw_NewFrame"][1]["funcname"] = "ImGui_ImplGlfw_NewFrame"
defs["ImGui_ImplGlfw_NewFrame"][1]["location"] = "imgui_impl_glfw:32" defs["ImGui_ImplGlfw_NewFrame"][1]["location"] = "imgui_impl_glfw:33"
defs["ImGui_ImplGlfw_NewFrame"][1]["ov_cimguiname"] = "ImGui_ImplGlfw_NewFrame" defs["ImGui_ImplGlfw_NewFrame"][1]["ov_cimguiname"] = "ImGui_ImplGlfw_NewFrame"
defs["ImGui_ImplGlfw_NewFrame"][1]["ret"] = "void" defs["ImGui_ImplGlfw_NewFrame"][1]["ret"] = "void"
defs["ImGui_ImplGlfw_NewFrame"][1]["signature"] = "()" defs["ImGui_ImplGlfw_NewFrame"][1]["signature"] = "()"
@@ -173,7 +194,7 @@ defs["ImGui_ImplGlfw_ScrollCallback"][1]["call_args"] = "(window,xoffset,yoffset
defs["ImGui_ImplGlfw_ScrollCallback"][1]["cimguiname"] = "ImGui_ImplGlfw_ScrollCallback" defs["ImGui_ImplGlfw_ScrollCallback"][1]["cimguiname"] = "ImGui_ImplGlfw_ScrollCallback"
defs["ImGui_ImplGlfw_ScrollCallback"][1]["defaults"] = {} defs["ImGui_ImplGlfw_ScrollCallback"][1]["defaults"] = {}
defs["ImGui_ImplGlfw_ScrollCallback"][1]["funcname"] = "ImGui_ImplGlfw_ScrollCallback" defs["ImGui_ImplGlfw_ScrollCallback"][1]["funcname"] = "ImGui_ImplGlfw_ScrollCallback"
defs["ImGui_ImplGlfw_ScrollCallback"][1]["location"] = "imgui_impl_glfw:38" defs["ImGui_ImplGlfw_ScrollCallback"][1]["location"] = "imgui_impl_glfw:39"
defs["ImGui_ImplGlfw_ScrollCallback"][1]["ov_cimguiname"] = "ImGui_ImplGlfw_ScrollCallback" defs["ImGui_ImplGlfw_ScrollCallback"][1]["ov_cimguiname"] = "ImGui_ImplGlfw_ScrollCallback"
defs["ImGui_ImplGlfw_ScrollCallback"][1]["ret"] = "void" defs["ImGui_ImplGlfw_ScrollCallback"][1]["ret"] = "void"
defs["ImGui_ImplGlfw_ScrollCallback"][1]["signature"] = "(GLFWwindow*,double,double)" defs["ImGui_ImplGlfw_ScrollCallback"][1]["signature"] = "(GLFWwindow*,double,double)"
@@ -188,7 +209,7 @@ defs["ImGui_ImplGlfw_Shutdown"][1]["call_args"] = "()"
defs["ImGui_ImplGlfw_Shutdown"][1]["cimguiname"] = "ImGui_ImplGlfw_Shutdown" defs["ImGui_ImplGlfw_Shutdown"][1]["cimguiname"] = "ImGui_ImplGlfw_Shutdown"
defs["ImGui_ImplGlfw_Shutdown"][1]["defaults"] = {} defs["ImGui_ImplGlfw_Shutdown"][1]["defaults"] = {}
defs["ImGui_ImplGlfw_Shutdown"][1]["funcname"] = "ImGui_ImplGlfw_Shutdown" defs["ImGui_ImplGlfw_Shutdown"][1]["funcname"] = "ImGui_ImplGlfw_Shutdown"
defs["ImGui_ImplGlfw_Shutdown"][1]["location"] = "imgui_impl_glfw:31" defs["ImGui_ImplGlfw_Shutdown"][1]["location"] = "imgui_impl_glfw:32"
defs["ImGui_ImplGlfw_Shutdown"][1]["ov_cimguiname"] = "ImGui_ImplGlfw_Shutdown" defs["ImGui_ImplGlfw_Shutdown"][1]["ov_cimguiname"] = "ImGui_ImplGlfw_Shutdown"
defs["ImGui_ImplGlfw_Shutdown"][1]["ret"] = "void" defs["ImGui_ImplGlfw_Shutdown"][1]["ret"] = "void"
defs["ImGui_ImplGlfw_Shutdown"][1]["signature"] = "()" defs["ImGui_ImplGlfw_Shutdown"][1]["signature"] = "()"

View File

@@ -164,9 +164,6 @@ igItemSize 2
igListBox 2 igListBox 2
1 bool igListBoxStr_arr (const char*,int*,const char* const[],int,int) 1 bool igListBoxStr_arr (const char*,int*,const char* const[],int,int)
2 bool igListBoxFnBoolPtr (const char*,int*,bool(*)(void*,int,const char**),void*,int,int) 2 bool igListBoxFnBoolPtr (const char*,int*,bool(*)(void*,int,const char**),void*,int,int)
igListBoxHeader 2
1 bool igListBoxHeaderVec2 (const char*,const ImVec2)
2 bool igListBoxHeaderInt (const char*,int,int)
igMarkIniSettingsDirty 2 igMarkIniSettingsDirty 2
1 void igMarkIniSettingsDirtyNil () 1 void igMarkIniSettingsDirtyNil ()
2 void igMarkIniSettingsDirtyWindowPtr (ImGuiWindow*) 2 void igMarkIniSettingsDirtyWindowPtr (ImGuiWindow*)
@@ -248,4 +245,4 @@ igValue 4
2 void igValueInt (const char*,int) 2 void igValueInt (const char*,int)
3 void igValueUint (const char*,unsigned int) 3 void igValueUint (const char*,unsigned int)
4 void igValueFloat (const char*,float,const char*) 4 void igValueFloat (const char*,float,const char*)
175 overloaded 173 overloaded

View File

@@ -1,55 +1,75 @@
{ {
"enums": { "enums": {
"ImDrawCornerFlags_": [ "ImDrawFlags_": [
{ {
"calc_value": 0, "calc_value": 0,
"name": "ImDrawCornerFlags_None", "name": "ImDrawFlags_None",
"value": "0" "value": "0"
}, },
{ {
"calc_value": 1, "calc_value": 1,
"name": "ImDrawCornerFlags_TopLeft", "name": "ImDrawFlags_Closed",
"value": "1 << 0" "value": "1 << 0"
}, },
{ {
"calc_value": 2, "calc_value": 16,
"name": "ImDrawCornerFlags_TopRight", "name": "ImDrawFlags_RoundCornersTopLeft",
"value": "1 << 1" "value": "1 << 4"
}, },
{ {
"calc_value": 4, "calc_value": 32,
"name": "ImDrawCornerFlags_BotLeft", "name": "ImDrawFlags_RoundCornersTopRight",
"value": "1 << 2" "value": "1 << 5"
}, },
{ {
"calc_value": 8, "calc_value": 64,
"name": "ImDrawCornerFlags_BotRight", "name": "ImDrawFlags_RoundCornersBottomLeft",
"value": "1 << 3" "value": "1 << 6"
}, },
{ {
"calc_value": 3, "calc_value": 128,
"name": "ImDrawCornerFlags_Top", "name": "ImDrawFlags_RoundCornersBottomRight",
"value": "ImDrawCornerFlags_TopLeft | ImDrawCornerFlags_TopRight" "value": "1 << 7"
}, },
{ {
"calc_value": 12, "calc_value": 256,
"name": "ImDrawCornerFlags_Bot", "name": "ImDrawFlags_RoundCornersNone",
"value": "ImDrawCornerFlags_BotLeft | ImDrawCornerFlags_BotRight" "value": "1 << 8"
}, },
{ {
"calc_value": 5, "calc_value": 48,
"name": "ImDrawCornerFlags_Left", "name": "ImDrawFlags_RoundCornersTop",
"value": "ImDrawCornerFlags_TopLeft | ImDrawCornerFlags_BotLeft" "value": "ImDrawFlags_RoundCornersTopLeft | ImDrawFlags_RoundCornersTopRight"
}, },
{ {
"calc_value": 10, "calc_value": 192,
"name": "ImDrawCornerFlags_Right", "name": "ImDrawFlags_RoundCornersBottom",
"value": "ImDrawCornerFlags_TopRight | ImDrawCornerFlags_BotRight" "value": "ImDrawFlags_RoundCornersBottomLeft | ImDrawFlags_RoundCornersBottomRight"
}, },
{ {
"calc_value": 15, "calc_value": 80,
"name": "ImDrawCornerFlags_All", "name": "ImDrawFlags_RoundCornersLeft",
"value": "0xF" "value": "ImDrawFlags_RoundCornersBottomLeft | ImDrawFlags_RoundCornersTopLeft"
},
{
"calc_value": 160,
"name": "ImDrawFlags_RoundCornersRight",
"value": "ImDrawFlags_RoundCornersBottomRight | ImDrawFlags_RoundCornersTopRight"
},
{
"calc_value": 240,
"name": "ImDrawFlags_RoundCornersAll",
"value": "ImDrawFlags_RoundCornersTopLeft | ImDrawFlags_RoundCornersTopRight | ImDrawFlags_RoundCornersBottomLeft | ImDrawFlags_RoundCornersBottomRight"
},
{
"calc_value": 240,
"name": "ImDrawFlags_RoundCornersDefault_",
"value": "ImDrawFlags_RoundCornersAll"
},
{
"calc_value": 496,
"name": "ImDrawFlags_RoundCornersMask_",
"value": "ImDrawFlags_RoundCornersAll | ImDrawFlags_RoundCornersNone"
} }
], ],
"ImDrawListFlags_": [ "ImDrawListFlags_": [
@@ -889,6 +909,11 @@
"calc_value": 6, "calc_value": 6,
"name": "ImGuiContextHookType_Shutdown", "name": "ImGuiContextHookType_Shutdown",
"value": "6" "value": "6"
},
{
"calc_value": 7,
"name": "ImGuiContextHookType_PendingRemoval_",
"value": "7"
} }
], ],
"ImGuiDataAuthority_": [ "ImGuiDataAuthority_": [
@@ -1346,17 +1371,17 @@
}, },
{ {
"calc_value": 2, "calc_value": 2,
"name": "ImGuiInputSource_Nav", "name": "ImGuiInputSource_Keyboard",
"value": "2" "value": "2"
}, },
{ {
"calc_value": 3, "calc_value": 3,
"name": "ImGuiInputSource_NavKeyboard", "name": "ImGuiInputSource_Gamepad",
"value": "3" "value": "3"
}, },
{ {
"calc_value": 4, "calc_value": 4,
"name": "ImGuiInputSource_NavGamepad", "name": "ImGuiInputSource_Nav",
"value": "4" "value": "4"
}, },
{ {
@@ -1438,7 +1463,7 @@
}, },
{ {
"calc_value": 8192, "calc_value": 8192,
"name": "ImGuiInputTextFlags_AlwaysInsertMode", "name": "ImGuiInputTextFlags_AlwaysOverwrite",
"value": "1 << 13" "value": "1 << 13"
}, },
{ {
@@ -1574,6 +1599,11 @@
"calc_value": 64, "calc_value": 64,
"name": "ImGuiItemStatusFlags_Deactivated", "name": "ImGuiItemStatusFlags_Deactivated",
"value": "1 << 6" "value": "1 << 6"
},
{
"calc_value": 128,
"name": "ImGuiItemStatusFlags_HoveredWindow",
"value": "1 << 7"
} }
], ],
"ImGuiKeyModFlags_": [ "ImGuiKeyModFlags_": [
@@ -3163,53 +3193,68 @@
}, },
{ {
"calc_value": 1, "calc_value": 1,
"name": "ImGuiViewportFlags_NoDecoration", "name": "ImGuiViewportFlags_IsPlatformWindow",
"value": "1 << 0" "value": "1 << 0"
}, },
{ {
"calc_value": 2, "calc_value": 2,
"name": "ImGuiViewportFlags_NoTaskBarIcon", "name": "ImGuiViewportFlags_IsPlatformMonitor",
"value": "1 << 1" "value": "1 << 1"
}, },
{ {
"calc_value": 4, "calc_value": 4,
"name": "ImGuiViewportFlags_NoFocusOnAppearing", "name": "ImGuiViewportFlags_OwnedByApp",
"value": "1 << 2" "value": "1 << 2"
}, },
{ {
"calc_value": 8, "calc_value": 8,
"name": "ImGuiViewportFlags_NoFocusOnClick", "name": "ImGuiViewportFlags_NoDecoration",
"value": "1 << 3" "value": "1 << 3"
}, },
{ {
"calc_value": 16, "calc_value": 16,
"name": "ImGuiViewportFlags_NoInputs", "name": "ImGuiViewportFlags_NoTaskBarIcon",
"value": "1 << 4" "value": "1 << 4"
}, },
{ {
"calc_value": 32, "calc_value": 32,
"name": "ImGuiViewportFlags_NoRendererClear", "name": "ImGuiViewportFlags_NoFocusOnAppearing",
"value": "1 << 5" "value": "1 << 5"
}, },
{ {
"calc_value": 64, "calc_value": 64,
"name": "ImGuiViewportFlags_TopMost", "name": "ImGuiViewportFlags_NoFocusOnClick",
"value": "1 << 6" "value": "1 << 6"
}, },
{ {
"calc_value": 128, "calc_value": 128,
"name": "ImGuiViewportFlags_Minimized", "name": "ImGuiViewportFlags_NoInputs",
"value": "1 << 7" "value": "1 << 7"
}, },
{ {
"calc_value": 256, "calc_value": 256,
"name": "ImGuiViewportFlags_NoAutoMerge", "name": "ImGuiViewportFlags_NoRendererClear",
"value": "1 << 8" "value": "1 << 8"
}, },
{ {
"calc_value": 512, "calc_value": 512,
"name": "ImGuiViewportFlags_CanHostOtherWindows", "name": "ImGuiViewportFlags_TopMost",
"value": "1 << 9" "value": "1 << 9"
},
{
"calc_value": 1024,
"name": "ImGuiViewportFlags_Minimized",
"value": "1 << 10"
},
{
"calc_value": 2048,
"name": "ImGuiViewportFlags_NoAutoMerge",
"value": "1 << 11"
},
{
"calc_value": 4096,
"name": "ImGuiViewportFlags_CanHostOtherWindows",
"value": "1 << 12"
} }
], ],
"ImGuiWindowDockStyleCol": [ "ImGuiWindowDockStyleCol": [
@@ -3414,149 +3459,150 @@
}, },
"enumtypes": [], "enumtypes": [],
"locations": { "locations": {
"ImBitVector": "imgui_internal:511", "ImBitVector": "imgui_internal:520",
"ImColor": "imgui:2284", "ImColor": "imgui:2269",
"ImDrawChannel": "imgui:2378", "ImDrawChannel": "imgui:2363",
"ImDrawCmd": "imgui:2333", "ImDrawCmd": "imgui:2318",
"ImDrawCmdHeader": "imgui:2370", "ImDrawCmdHeader": "imgui:2355",
"ImDrawCornerFlags_": "imgui:2402", "ImDrawData": "imgui:2552",
"ImDrawData": "imgui:2557", "ImDrawDataBuilder": "imgui_internal:683",
"ImDrawDataBuilder": "imgui_internal:655", "ImDrawFlags_": "imgui:2389",
"ImDrawList": "imgui:2435", "ImDrawList": "imgui:2427",
"ImDrawListFlags_": "imgui:2418", "ImDrawListFlags_": "imgui:2409",
"ImDrawListSharedData": "imgui_internal:636", "ImDrawListSharedData": "imgui_internal:663",
"ImDrawListSplitter": "imgui:2387", "ImDrawListSplitter": "imgui:2372",
"ImDrawVert": "imgui:2355", "ImDrawVert": "imgui:2340",
"ImFont": "imgui:2769", "ImFont": "imgui:2770",
"ImFontAtlas": "imgui:2674", "ImFontAtlas": "imgui:2669",
"ImFontAtlasCustomRect": "imgui:2636", "ImFontAtlasCustomRect": "imgui:2631",
"ImFontAtlasFlags_": "imgui:2649", "ImFontAtlasFlags_": "imgui:2644",
"ImFontConfig": "imgui:2581", "ImFontBuilderIO": "imgui_internal:2822",
"ImFontGlyph": "imgui:2610", "ImFontConfig": "imgui:2575",
"ImFontGlyphRangesBuilder": "imgui:2621", "ImFontGlyph": "imgui:2604",
"ImGuiAxis": "imgui_internal:792", "ImFontGlyphRangesBuilder": "imgui:2616",
"ImGuiBackendFlags_": "imgui:1423", "ImGuiAxis": "imgui_internal:822",
"ImGuiButtonFlagsPrivate_": "imgui_internal:706", "ImGuiBackendFlags_": "imgui:1449",
"ImGuiButtonFlags_": "imgui:1536", "ImGuiButtonFlagsPrivate_": "imgui_internal:736",
"ImGuiCol_": "imgui:1438", "ImGuiButtonFlags_": "imgui:1562",
"ImGuiColorEditFlags_": "imgui:1549", "ImGuiCol_": "imgui:1464",
"ImGuiColorMod": "imgui_internal:899", "ImGuiColorEditFlags_": "imgui:1575",
"ImGuiComboFlags_": "imgui:1038", "ImGuiColorMod": "imgui_internal:929",
"ImGuiCond_": "imgui:1641", "ImGuiComboFlags_": "imgui:1064",
"ImGuiConfigFlags_": "imgui:1398", "ImGuiCond_": "imgui:1667",
"ImGuiContext": "imgui_internal:1425", "ImGuiConfigFlags_": "imgui:1424",
"ImGuiContextHook": "imgui_internal:1411", "ImGuiContext": "imgui_internal:1455",
"ImGuiContextHookType": "imgui_internal:1409", "ImGuiContextHook": "imgui_internal:1440",
"ImGuiDataAuthority_": "imgui_internal:1180", "ImGuiContextHookType": "imgui_internal:1438",
"ImGuiDataTypeInfo": "imgui_internal:882", "ImGuiDataAuthority_": "imgui_internal:1211",
"ImGuiDataTypePrivate_": "imgui_internal:891", "ImGuiDataTypeInfo": "imgui_internal:912",
"ImGuiDataTypeTempStorage": "imgui_internal:876", "ImGuiDataTypePrivate_": "imgui_internal:921",
"ImGuiDataType_": "imgui:1290", "ImGuiDataTypeTempStorage": "imgui_internal:906",
"ImGuiDir_": "imgui:1306", "ImGuiDataType_": "imgui:1316",
"ImGuiDockContext": "imgui_internal:1272", "ImGuiDir_": "imgui:1332",
"ImGuiDockNode": "imgui_internal:1196", "ImGuiDockContext": "imgui_internal:1302",
"ImGuiDockNodeFlagsPrivate_": "imgui_internal:1156", "ImGuiDockNode": "imgui_internal:1227",
"ImGuiDockNodeFlags_": "imgui:1255", "ImGuiDockNodeFlagsPrivate_": "imgui_internal:1187",
"ImGuiDockNodeState": "imgui_internal:1187", "ImGuiDockNodeFlags_": "imgui:1281",
"ImGuiDragDropFlags_": "imgui:1268", "ImGuiDockNodeState": "imgui_internal:1218",
"ImGuiFocusedFlags_": "imgui:1225", "ImGuiDragDropFlags_": "imgui:1294",
"ImGuiGroupData": "imgui_internal:916", "ImGuiFocusedFlags_": "imgui:1251",
"ImGuiHoveredFlags_": "imgui:1237", "ImGuiGroupData": "imgui_internal:946",
"ImGuiIO": "imgui:1801", "ImGuiHoveredFlags_": "imgui:1263",
"ImGuiInputReadMode": "imgui_internal:816", "ImGuiIO": "imgui:1827",
"ImGuiInputSource": "imgui_internal:805", "ImGuiInputReadMode": "imgui_internal:846",
"ImGuiInputTextCallbackData": "imgui:1951", "ImGuiInputSource": "imgui_internal:835",
"ImGuiInputTextFlags_": "imgui:953", "ImGuiInputTextCallbackData": "imgui:1977",
"ImGuiInputTextState": "imgui_internal:945", "ImGuiInputTextFlags_": "imgui:974",
"ImGuiItemFlags_": "imgui_internal:670", "ImGuiInputTextState": "imgui_internal:976",
"ImGuiItemStatusFlags_": "imgui_internal:685", "ImGuiItemFlags_": "imgui_internal:699",
"ImGuiKeyModFlags_": "imgui:1353", "ImGuiItemStatusFlags_": "imgui_internal:714",
"ImGuiKey_": "imgui:1325", "ImGuiKeyModFlags_": "imgui:1379",
"ImGuiLastItemDataBackup": "imgui_internal:2030", "ImGuiKey_": "imgui:1351",
"ImGuiLayoutType_": "imgui_internal:776", "ImGuiLastItemDataBackup": "imgui_internal:2067",
"ImGuiListClipper": "imgui:2235", "ImGuiLayoutType_": "imgui_internal:806",
"ImGuiLogType": "imgui_internal:782", "ImGuiListClipper": "imgui:2220",
"ImGuiMenuColumns": "imgui_internal:931", "ImGuiLogType": "imgui_internal:812",
"ImGuiMetricsConfig": "imgui_internal:1365", "ImGuiMenuColumns": "imgui_internal:962",
"ImGuiMouseButton_": "imgui:1613", "ImGuiMetricsConfig": "imgui_internal:1394",
"ImGuiMouseCursor_": "imgui:1623", "ImGuiMouseButton_": "imgui:1639",
"ImGuiNavDirSourceFlags_": "imgui_internal:835", "ImGuiMouseCursor_": "imgui:1649",
"ImGuiNavForward": "imgui_internal:855", "ImGuiNavDirSourceFlags_": "imgui_internal:865",
"ImGuiNavHighlightFlags_": "imgui_internal:826", "ImGuiNavForward": "imgui_internal:885",
"ImGuiNavInput_": "imgui:1366", "ImGuiNavHighlightFlags_": "imgui_internal:856",
"ImGuiNavLayer": "imgui_internal:862", "ImGuiNavInput_": "imgui:1392",
"ImGuiNavMoveFlags_": "imgui_internal:843", "ImGuiNavLayer": "imgui_internal:892",
"ImGuiNavMoveResult": "imgui_internal:993", "ImGuiNavMoveFlags_": "imgui_internal:873",
"ImGuiNextItemData": "imgui_internal:1058", "ImGuiNavMoveResult": "imgui_internal:1024",
"ImGuiNextItemDataFlags_": "imgui_internal:1051", "ImGuiNextItemData": "imgui_internal:1089",
"ImGuiNextWindowData": "imgui_internal:1024", "ImGuiNextItemDataFlags_": "imgui_internal:1082",
"ImGuiNextWindowDataFlags_": "imgui_internal:1007", "ImGuiNextWindowData": "imgui_internal:1055",
"ImGuiOldColumnData": "imgui_internal:1110", "ImGuiNextWindowDataFlags_": "imgui_internal:1038",
"ImGuiOldColumnFlags_": "imgui_internal:1090", "ImGuiOldColumnData": "imgui_internal:1141",
"ImGuiOldColumns": "imgui_internal:1120", "ImGuiOldColumnFlags_": "imgui_internal:1121",
"ImGuiOnceUponAFrame": "imgui:2113", "ImGuiOldColumns": "imgui_internal:1151",
"ImGuiPayload": "imgui:2013", "ImGuiOnceUponAFrame": "imgui:2098",
"ImGuiPlatformIO": "imgui:2870", "ImGuiPayload": "imgui:2039",
"ImGuiPlatformMonitor": "imgui:2935", "ImGuiPlatformIO": "imgui:2933",
"ImGuiPlotType": "imgui_internal:799", "ImGuiPlatformMonitor": "imgui:2997",
"ImGuiPopupData": "imgui_internal:980", "ImGuiPlotType": "imgui_internal:829",
"ImGuiPopupFlags_": "imgui:1011", "ImGuiPopupData": "imgui_internal:1011",
"ImGuiPopupPositionPolicy": "imgui_internal:869", "ImGuiPopupFlags_": "imgui:1037",
"ImGuiPtrOrIndex": "imgui_internal:1076", "ImGuiPopupPositionPolicy": "imgui_internal:899",
"ImGuiSelectableFlagsPrivate_": "imgui_internal:736", "ImGuiPtrOrIndex": "imgui_internal:1107",
"ImGuiSelectableFlags_": "imgui:1027", "ImGuiSelectableFlagsPrivate_": "imgui_internal:766",
"ImGuiSeparatorFlags_": "imgui_internal:754", "ImGuiSelectableFlags_": "imgui:1053",
"ImGuiSettingsHandler": "imgui_internal:1346", "ImGuiSeparatorFlags_": "imgui_internal:784",
"ImGuiShrinkWidthItem": "imgui_internal:1070", "ImGuiSettingsHandler": "imgui_internal:1375",
"ImGuiSizeCallbackData": "imgui:1982", "ImGuiShrinkWidthItem": "imgui_internal:1101",
"ImGuiSliderFlagsPrivate_": "imgui_internal:729", "ImGuiSizeCallbackData": "imgui:2008",
"ImGuiSliderFlags_": "imgui:1596", "ImGuiSliderFlagsPrivate_": "imgui_internal:759",
"ImGuiSortDirection_": "imgui:1317", "ImGuiSliderFlags_": "imgui:1622",
"ImGuiStackSizes": "imgui_internal:1389", "ImGuiSortDirection_": "imgui:1343",
"ImGuiStorage": "imgui:2175", "ImGuiStackSizes": "imgui_internal:1418",
"ImGuiStoragePair": "imgui:2178", "ImGuiStorage": "imgui:2160",
"ImGuiStyle": "imgui:1747", "ImGuiStoragePair": "imgui:2163",
"ImGuiStyleMod": "imgui_internal:906", "ImGuiStyle": "imgui:1773",
"ImGuiStyleVar_": "imgui:1505", "ImGuiStyleMod": "imgui_internal:936",
"ImGuiTabBar": "imgui_internal:2083", "ImGuiStyleVar_": "imgui:1531",
"ImGuiTabBarFlagsPrivate_": "imgui_internal:2047", "ImGuiTabBar": "imgui_internal:2120",
"ImGuiTabBarFlags_": "imgui:1052", "ImGuiTabBarFlagsPrivate_": "imgui_internal:2084",
"ImGuiTabItem": "imgui_internal:2064", "ImGuiTabBarFlags_": "imgui:1078",
"ImGuiTabItemFlagsPrivate_": "imgui_internal:2055", "ImGuiTabItem": "imgui_internal:2101",
"ImGuiTabItemFlags_": "imgui:1068", "ImGuiTabItemFlagsPrivate_": "imgui_internal:2092",
"ImGuiTable": "imgui_internal:2211", "ImGuiTabItemFlags_": "imgui:1094",
"ImGuiTableBgTarget_": "imgui:1216", "ImGuiTable": "imgui_internal:2248",
"ImGuiTableCellData": "imgui_internal:2204", "ImGuiTableBgTarget_": "imgui:1242",
"ImGuiTableColumn": "imgui_internal:2146", "ImGuiTableCellData": "imgui_internal:2241",
"ImGuiTableColumnFlags_": "imgui:1161", "ImGuiTableColumn": "imgui_internal:2183",
"ImGuiTableColumnSettings": "imgui_internal:2329", "ImGuiTableColumnFlags_": "imgui:1187",
"ImGuiTableColumnSortSpecs": "imgui:2035", "ImGuiTableColumnSettings": "imgui_internal:2367",
"ImGuiTableFlags_": "imgui:1104", "ImGuiTableColumnSortSpecs": "imgui:2061",
"ImGuiTableRowFlags_": "imgui:1201", "ImGuiTableFlags_": "imgui:1130",
"ImGuiTableSettings": "imgui_internal:2353", "ImGuiTableRowFlags_": "imgui:1227",
"ImGuiTableSortSpecs": "imgui:2049", "ImGuiTableSettings": "imgui_internal:2391",
"ImGuiTextBuffer": "imgui:2148", "ImGuiTableSortSpecs": "imgui:2075",
"ImGuiTextFilter": "imgui:2121", "ImGuiTextBuffer": "imgui:2133",
"ImGuiTextFlags_": "imgui_internal:762", "ImGuiTextFilter": "imgui:2106",
"ImGuiTextRange": "imgui:2131", "ImGuiTextFlags_": "imgui_internal:792",
"ImGuiTooltipFlags_": "imgui_internal:768", "ImGuiTextRange": "imgui:2116",
"ImGuiTreeNodeFlagsPrivate_": "imgui_internal:749", "ImGuiTooltipFlags_": "imgui_internal:798",
"ImGuiTreeNodeFlags_": "imgui:982", "ImGuiTreeNodeFlagsPrivate_": "imgui_internal:779",
"ImGuiViewport": "imgui:2962", "ImGuiTreeNodeFlags_": "imgui:1008",
"ImGuiViewportFlags_": "imgui:2944", "ImGuiViewport": "imgui:2851",
"ImGuiViewportP": "imgui_internal:1291", "ImGuiViewportFlags_": "imgui:2826",
"ImGuiWindow": "imgui_internal:1896", "ImGuiViewportP": "imgui_internal:1319",
"ImGuiWindowClass": "imgui:1997", "ImGuiWindow": "imgui_internal:1932",
"ImGuiWindowDockStyle": "imgui_internal:1267", "ImGuiWindowClass": "imgui:2023",
"ImGuiWindowDockStyleCol": "imgui_internal:1256", "ImGuiWindowDockStyle": "imgui_internal:1297",
"ImGuiWindowFlags_": "imgui:910", "ImGuiWindowDockStyleCol": "imgui_internal:1286",
"ImGuiWindowSettings": "imgui_internal:1329", "ImGuiWindowFlags_": "imgui:931",
"ImGuiWindowTempData": "imgui_internal:1840", "ImGuiWindowSettings": "imgui_internal:1358",
"ImRect": "imgui_internal:442", "ImGuiWindowTempData": "imgui_internal:1876",
"ImVec1": "imgui_internal:424", "ImRect": "imgui_internal:450",
"ImVec2": "imgui:232", "ImVec1": "imgui_internal:432",
"ImVec2ih": "imgui_internal:432", "ImVec2": "imgui:237",
"ImVec4": "imgui:245", "ImVec2ih": "imgui_internal:440",
"ImVec4": "imgui:250",
"STB_TexteditState": "imstb_textedit:317", "STB_TexteditState": "imstb_textedit:317",
"StbTexteditRow": "imstb_textedit:364", "StbTexteditRow": "imstb_textedit:364",
"StbUndoRecord": "imstb_textedit:299", "StbUndoRecord": "imstb_textedit:299",
@@ -3637,10 +3683,6 @@
"name": "Valid", "name": "Valid",
"type": "bool" "type": "bool"
}, },
{
"name": "CmdLists",
"type": "ImDrawList**"
},
{ {
"name": "CmdListsCount", "name": "CmdListsCount",
"type": "int" "type": "int"
@@ -3653,6 +3695,10 @@
"name": "TotalVtxCount", "name": "TotalVtxCount",
"type": "int" "type": "int"
}, },
{
"name": "CmdLists",
"type": "ImDrawList**"
},
{ {
"name": "DisplayPos", "name": "DisplayPos",
"type": "ImVec2" "type": "ImVec2"
@@ -3776,10 +3822,14 @@
"type": "ImDrawListFlags" "type": "ImDrawListFlags"
}, },
{ {
"name": "ArcFastVtx[12*1]", "name": "ArcFastVtx[48]",
"size": 12, "size": 48,
"type": "ImVec2" "type": "ImVec2"
}, },
{
"name": "ArcFastRadiusCutoff",
"type": "float"
},
{ {
"name": "CircleSegmentCounts[64]", "name": "CircleSegmentCounts[64]",
"size": 64, "size": 64,
@@ -3894,10 +3944,6 @@
} }
], ],
"ImFontAtlas": [ "ImFontAtlas": [
{
"name": "Locked",
"type": "bool"
},
{ {
"name": "Flags", "name": "Flags",
"type": "ImFontAtlasFlags" "type": "ImFontAtlasFlags"
@@ -3914,6 +3960,14 @@
"name": "TexGlyphPadding", "name": "TexGlyphPadding",
"type": "int" "type": "int"
}, },
{
"name": "Locked",
"type": "bool"
},
{
"name": "TexPixelsUseColors",
"type": "bool"
},
{ {
"name": "TexPixelsAlpha8", "name": "TexPixelsAlpha8",
"type": "unsigned char*" "type": "unsigned char*"
@@ -3958,6 +4012,14 @@
"size": 64, "size": 64,
"type": "ImVec4" "type": "ImVec4"
}, },
{
"name": "FontBuilderIO",
"type": "const ImFontBuilderIO*"
},
{
"name": "FontBuilderFlags",
"type": "unsigned int"
},
{ {
"name": "PackIdMouseCursors", "name": "PackIdMouseCursors",
"type": "int" "type": "int"
@@ -4001,6 +4063,12 @@
"type": "ImFont*" "type": "ImFont*"
} }
], ],
"ImFontBuilderIO": [
{
"name": "FontBuilder_Build",
"type": "bool(*)(ImFontAtlas* atlas)"
}
],
"ImFontConfig": [ "ImFontConfig": [
{ {
"name": "FontData", "name": "FontData",
@@ -4059,7 +4127,7 @@
"type": "bool" "type": "bool"
}, },
{ {
"name": "RasterizerFlags", "name": "FontBuilderFlags",
"type": "unsigned int" "type": "unsigned int"
}, },
{ {
@@ -4082,8 +4150,8 @@
], ],
"ImFontGlyph": [ "ImFontGlyph": [
{ {
"bitfield": "31", "bitfield": "1",
"name": "Codepoint", "name": "Colored",
"type": "unsigned int" "type": "unsigned int"
}, },
{ {
@@ -4091,6 +4159,11 @@
"name": "Visible", "name": "Visible",
"type": "unsigned int" "type": "unsigned int"
}, },
{
"bitfield": "30",
"name": "Codepoint",
"type": "unsigned int"
},
{ {
"name": "AdvanceX", "name": "AdvanceX",
"type": "float" "type": "float"
@@ -4274,10 +4347,6 @@
"name": "HoveredWindow", "name": "HoveredWindow",
"type": "ImGuiWindow*" "type": "ImGuiWindow*"
}, },
{
"name": "HoveredRootWindow",
"type": "ImGuiWindow*"
},
{ {
"name": "HoveredWindowUnderMovingWindow", "name": "HoveredWindowUnderMovingWindow",
"type": "ImGuiWindow*" "type": "ImGuiWindow*"
@@ -4495,6 +4564,14 @@
"name": "MouseLastHoveredViewport", "name": "MouseLastHoveredViewport",
"type": "ImGuiViewportP*" "type": "ImGuiViewportP*"
}, },
{
"name": "PlatformLastFocusedViewportId",
"type": "ImGuiID"
},
{
"name": "FallbackMonitor",
"type": "ImGuiPlatformMonitor"
},
{ {
"name": "ViewportFrontMostStampCount", "name": "ViewportFrontMostStampCount",
"type": "int" "type": "int"
@@ -4676,31 +4753,31 @@
"type": "bool" "type": "bool"
}, },
{ {
"name": "FocusRequestCurrWindow", "name": "TabFocusRequestCurrWindow",
"type": "ImGuiWindow*" "type": "ImGuiWindow*"
}, },
{ {
"name": "FocusRequestNextWindow", "name": "TabFocusRequestNextWindow",
"type": "ImGuiWindow*" "type": "ImGuiWindow*"
}, },
{ {
"name": "FocusRequestCurrCounterRegular", "name": "TabFocusRequestCurrCounterRegular",
"type": "int" "type": "int"
}, },
{ {
"name": "FocusRequestCurrCounterTabStop", "name": "TabFocusRequestCurrCounterTabStop",
"type": "int" "type": "int"
}, },
{ {
"name": "FocusRequestNextCounterRegular", "name": "TabFocusRequestNextCounterRegular",
"type": "int" "type": "int"
}, },
{ {
"name": "FocusRequestNextCounterTabStop", "name": "TabFocusRequestNextCounterTabStop",
"type": "int" "type": "int"
}, },
{ {
"name": "FocusTabPressed", "name": "TabFocusPressed",
"type": "bool" "type": "bool"
}, },
{ {
@@ -4955,6 +5032,10 @@
"template_type": "ImGuiContextHook", "template_type": "ImGuiContextHook",
"type": "ImVector_ImGuiContextHook" "type": "ImVector_ImGuiContextHook"
}, },
{
"name": "HookIdNext",
"type": "ImGuiID"
},
{ {
"name": "LogEnabled", "name": "LogEnabled",
"type": "bool" "type": "bool"
@@ -4971,6 +5052,14 @@
"name": "LogBuffer", "name": "LogBuffer",
"type": "ImGuiTextBuffer" "type": "ImGuiTextBuffer"
}, },
{
"name": "LogNextPrefix",
"type": "const char*"
},
{
"name": "LogNextSuffix",
"type": "const char*"
},
{ {
"name": "LogLinePosY", "name": "LogLinePosY",
"type": "float" "type": "float"
@@ -5035,6 +5124,10 @@
} }
], ],
"ImGuiContextHook": [ "ImGuiContextHook": [
{
"name": "HookId",
"type": "ImGuiID"
},
{ {
"name": "Type", "name": "Type",
"type": "ImGuiContextHookType" "type": "ImGuiContextHookType"
@@ -5227,11 +5320,6 @@
"name": "HasWindowMenuButton", "name": "HasWindowMenuButton",
"type": "bool" "type": "bool"
}, },
{
"bitfield": "1",
"name": "EnableCloseButton",
"type": "bool"
},
{ {
"bitfield": "1", "bitfield": "1",
"name": "WantCloseAll", "name": "WantCloseAll",
@@ -5300,6 +5388,10 @@
"name": "BackupActiveIdPreviousFrameIsAlive", "name": "BackupActiveIdPreviousFrameIsAlive",
"type": "bool" "type": "bool"
}, },
{
"name": "BackupHoveredIdIsAlive",
"type": "bool"
},
{ {
"name": "EmitItem", "name": "EmitItem",
"type": "bool" "type": "bool"
@@ -6270,10 +6362,6 @@
"template_type": "ImGuiPlatformMonitor", "template_type": "ImGuiPlatformMonitor",
"type": "ImVector_ImGuiPlatformMonitor" "type": "ImVector_ImGuiPlatformMonitor"
}, },
{
"name": "MainViewport",
"type": "ImGuiViewport*"
},
{ {
"name": "Viewports", "name": "Viewports",
"template_type": "ImGuiViewport*", "template_type": "ImGuiViewport*",
@@ -6609,7 +6697,7 @@
"type": "float" "type": "float"
}, },
{ {
"name": "CircleSegmentMaxError", "name": "CircleTessellationMaxError",
"type": "float" "type": "float"
}, },
{ {
@@ -7145,6 +7233,14 @@
"name": "ReorderColumnDir", "name": "ReorderColumnDir",
"type": "ImGuiTableColumnIdx" "type": "ImGuiTableColumnIdx"
}, },
{
"name": "LeftMostEnabledColumn",
"type": "ImGuiTableColumnIdx"
},
{
"name": "RightMostEnabledColumn",
"type": "ImGuiTableColumnIdx"
},
{ {
"name": "LeftMostStretchedColumn", "name": "LeftMostStretchedColumn",
"type": "ImGuiTableColumnIdx" "type": "ImGuiTableColumnIdx"
@@ -7153,10 +7249,6 @@
"name": "RightMostStretchedColumn", "name": "RightMostStretchedColumn",
"type": "ImGuiTableColumnIdx" "type": "ImGuiTableColumnIdx"
}, },
{
"name": "RightMostEnabledColumn",
"type": "ImGuiTableColumnIdx"
},
{ {
"name": "ContextPopupColumn", "name": "ContextPopupColumn",
"type": "ImGuiTableColumnIdx" "type": "ImGuiTableColumnIdx"
@@ -7576,25 +7668,25 @@
"type": "ImVec2" "type": "ImVec2"
}, },
{ {
"name": "WorkOffsetMin", "name": "WorkPos",
"type": "ImVec2" "type": "ImVec2"
}, },
{ {
"name": "WorkOffsetMax", "name": "WorkSize",
"type": "ImVec2" "type": "ImVec2"
}, },
{ {
"name": "DpiScale", "name": "DpiScale",
"type": "float" "type": "float"
}, },
{
"name": "DrawData",
"type": "ImDrawData*"
},
{ {
"name": "ParentViewportId", "name": "ParentViewportId",
"type": "ImGuiID" "type": "ImGuiID"
}, },
{
"name": "DrawData",
"type": "ImDrawData*"
},
{ {
"name": "RendererUserData", "name": "RendererUserData",
"type": "void*" "type": "void*"
@@ -7637,11 +7729,6 @@
"name": "LastFrameActive", "name": "LastFrameActive",
"type": "int" "type": "int"
}, },
{
"name": "LastFrameDrawLists[2]",
"size": 2,
"type": "int"
},
{ {
"name": "LastFrontMostStampCount", "name": "LastFrontMostStampCount",
"type": "int" "type": "int"
@@ -7674,6 +7761,11 @@
"name": "Window", "name": "Window",
"type": "ImGuiWindow*" "type": "ImGuiWindow*"
}, },
{
"name": "DrawListsLastFrame[2]",
"size": 2,
"type": "int"
},
{ {
"name": "DrawLists[2]", "name": "DrawLists[2]",
"size": 2, "size": 2,
@@ -7699,6 +7791,14 @@
"name": "LastRendererSize", "name": "LastRendererSize",
"type": "ImVec2" "type": "ImVec2"
}, },
{
"name": "WorkOffsetMin",
"type": "ImVec2"
},
{
"name": "WorkOffsetMax",
"type": "ImVec2"
},
{ {
"name": "CurrWorkOffsetMin", "name": "CurrWorkOffsetMin",
"type": "ImVec2" "type": "ImVec2"
@@ -7921,6 +8021,10 @@
"name": "HiddenFramesForRenderOnly", "name": "HiddenFramesForRenderOnly",
"type": "ImS8" "type": "ImS8"
}, },
{
"name": "DisableInputsFrames",
"type": "ImS8"
},
{ {
"bitfield": "8", "bitfield": "8",
"name": "SetWindowPosAllowFlags", "name": "SetWindowPosAllowFlags",
@@ -8048,7 +8152,7 @@
"type": "ImGuiWindow*" "type": "ImGuiWindow*"
}, },
{ {
"name": "RootWindowDockStop", "name": "RootWindowDockTree",
"type": "ImGuiWindow*" "type": "ImGuiWindow*"
}, },
{ {

File diff suppressed because it is too large Load Diff

View File

@@ -5,9 +5,9 @@
"ImDrawChannel": "struct ImDrawChannel", "ImDrawChannel": "struct ImDrawChannel",
"ImDrawCmd": "struct ImDrawCmd", "ImDrawCmd": "struct ImDrawCmd",
"ImDrawCmdHeader": "struct ImDrawCmdHeader", "ImDrawCmdHeader": "struct ImDrawCmdHeader",
"ImDrawCornerFlags": "int",
"ImDrawData": "struct ImDrawData", "ImDrawData": "struct ImDrawData",
"ImDrawDataBuilder": "struct ImDrawDataBuilder", "ImDrawDataBuilder": "struct ImDrawDataBuilder",
"ImDrawFlags": "int",
"ImDrawIdx": "unsigned short", "ImDrawIdx": "unsigned short",
"ImDrawList": "struct ImDrawList", "ImDrawList": "struct ImDrawList",
"ImDrawListFlags": "int", "ImDrawListFlags": "int",
@@ -19,6 +19,7 @@
"ImFontAtlas": "struct ImFontAtlas", "ImFontAtlas": "struct ImFontAtlas",
"ImFontAtlasCustomRect": "struct ImFontAtlasCustomRect", "ImFontAtlasCustomRect": "struct ImFontAtlasCustomRect",
"ImFontAtlasFlags": "int", "ImFontAtlasFlags": "int",
"ImFontBuilderIO": "struct ImFontBuilderIO",
"ImFontConfig": "struct ImFontConfig", "ImFontConfig": "struct ImFontConfig",
"ImFontGlyph": "struct ImFontGlyph", "ImFontGlyph": "struct ImFontGlyph",
"ImFontGlyphRangesBuilder": "struct ImFontGlyphRangesBuilder", "ImFontGlyphRangesBuilder": "struct ImFontGlyphRangesBuilder",
@@ -61,6 +62,8 @@
"ImGuiLastItemDataBackup": "struct ImGuiLastItemDataBackup", "ImGuiLastItemDataBackup": "struct ImGuiLastItemDataBackup",
"ImGuiLayoutType": "int", "ImGuiLayoutType": "int",
"ImGuiListClipper": "struct ImGuiListClipper", "ImGuiListClipper": "struct ImGuiListClipper",
"ImGuiMemAllocFunc": "void*(*)(size_t sz,void* user_data);",
"ImGuiMemFreeFunc": "void(*)(void* ptr,void* user_data);",
"ImGuiMenuColumns": "struct ImGuiMenuColumns", "ImGuiMenuColumns": "struct ImGuiMenuColumns",
"ImGuiMetricsConfig": "struct ImGuiMetricsConfig", "ImGuiMetricsConfig": "struct ImGuiMetricsConfig",
"ImGuiMouseButton": "int", "ImGuiMouseButton": "int",

View File

@@ -5,9 +5,9 @@ defs["ImDrawCallback"] = "void(*)(const ImDrawList* parent_list,const ImDrawCmd*
defs["ImDrawChannel"] = "struct ImDrawChannel" defs["ImDrawChannel"] = "struct ImDrawChannel"
defs["ImDrawCmd"] = "struct ImDrawCmd" defs["ImDrawCmd"] = "struct ImDrawCmd"
defs["ImDrawCmdHeader"] = "struct ImDrawCmdHeader" defs["ImDrawCmdHeader"] = "struct ImDrawCmdHeader"
defs["ImDrawCornerFlags"] = "int"
defs["ImDrawData"] = "struct ImDrawData" defs["ImDrawData"] = "struct ImDrawData"
defs["ImDrawDataBuilder"] = "struct ImDrawDataBuilder" defs["ImDrawDataBuilder"] = "struct ImDrawDataBuilder"
defs["ImDrawFlags"] = "int"
defs["ImDrawIdx"] = "unsigned short" defs["ImDrawIdx"] = "unsigned short"
defs["ImDrawList"] = "struct ImDrawList" defs["ImDrawList"] = "struct ImDrawList"
defs["ImDrawListFlags"] = "int" defs["ImDrawListFlags"] = "int"
@@ -19,6 +19,7 @@ defs["ImFont"] = "struct ImFont"
defs["ImFontAtlas"] = "struct ImFontAtlas" defs["ImFontAtlas"] = "struct ImFontAtlas"
defs["ImFontAtlasCustomRect"] = "struct ImFontAtlasCustomRect" defs["ImFontAtlasCustomRect"] = "struct ImFontAtlasCustomRect"
defs["ImFontAtlasFlags"] = "int" defs["ImFontAtlasFlags"] = "int"
defs["ImFontBuilderIO"] = "struct ImFontBuilderIO"
defs["ImFontConfig"] = "struct ImFontConfig" defs["ImFontConfig"] = "struct ImFontConfig"
defs["ImFontGlyph"] = "struct ImFontGlyph" defs["ImFontGlyph"] = "struct ImFontGlyph"
defs["ImFontGlyphRangesBuilder"] = "struct ImFontGlyphRangesBuilder" defs["ImFontGlyphRangesBuilder"] = "struct ImFontGlyphRangesBuilder"
@@ -61,6 +62,8 @@ defs["ImGuiKeyModFlags"] = "int"
defs["ImGuiLastItemDataBackup"] = "struct ImGuiLastItemDataBackup" defs["ImGuiLastItemDataBackup"] = "struct ImGuiLastItemDataBackup"
defs["ImGuiLayoutType"] = "int" defs["ImGuiLayoutType"] = "int"
defs["ImGuiListClipper"] = "struct ImGuiListClipper" defs["ImGuiListClipper"] = "struct ImGuiListClipper"
defs["ImGuiMemAllocFunc"] = "void*(*)(size_t sz,void* user_data);"
defs["ImGuiMemFreeFunc"] = "void(*)(void* ptr,void* user_data);"
defs["ImGuiMenuColumns"] = "struct ImGuiMenuColumns" defs["ImGuiMenuColumns"] = "struct ImGuiMenuColumns"
defs["ImGuiMetricsConfig"] = "struct ImGuiMetricsConfig" defs["ImGuiMetricsConfig"] = "struct ImGuiMetricsConfig"
defs["ImGuiMouseButton"] = "int" defs["ImGuiMouseButton"] = "int"

2
imgui

Submodule imgui updated: bb26751b94...256594575d

View File

@@ -2,6 +2,14 @@
#include <assert.h> #include <assert.h>
#include "../cimgui.h" #include "../cimgui.h"
#ifdef IMGUI_HAS_IMSTR
#define igBegin igBegin_Strv
#define igSliderFloat igSliderFloat_Strv
#define igCheckbox igCheckbox_Strv
#define igColorEdit3 igColorEdit3_Strv
#define igButton igButton_Strv
#endif
int main(void) int main(void)
{ {
assert(igDebugCheckVersionAndDataLayout(igGetVersion(), sizeof(ImGuiIO), sizeof(ImGuiStyle), assert(igDebugCheckVersionAndDataLayout(igGetVersion(), sizeof(ImGuiIO), sizeof(ImGuiStyle),