Merge branch 'docking_inter'

This commit is contained in:
Victor Bombi
2021-02-11 14:58:25 +01:00
14 changed files with 4193 additions and 3023 deletions

View File

@@ -1,5 +1,5 @@
//This file is automatically generated by generator.lua from https://github.com/cimgui/cimgui
//based on imgui.h file version "1.80" from Dear ImGui https://github.com/ocornut/imgui
//based on imgui.h file version "1.81" from Dear ImGui https://github.com/ocornut/imgui
//with imgui_internal.h api
#include "./imgui/imgui.h"
@@ -941,6 +941,14 @@ CIMGUI_API bool igSelectableBoolPtr(const char* label,bool* p_selected,ImGuiSele
{
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)
{
return ImGui::ListBox(label,current_item,items,items_count,height_in_items);
@@ -949,18 +957,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);
}
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)
{
return ImGui::PlotLines(label,values,values_count,values_offset,overlay_text,scale_min,scale_max,graph_size,stride);
@@ -1336,6 +1332,10 @@ CIMGUI_API void igSetItemAllowOverlap()
{
return ImGui::SetItemAllowOverlap();
}
CIMGUI_API ImGuiViewport* igGetMainViewport()
{
return ImGui::GetMainViewport();
}
CIMGUI_API bool igIsRectVisibleNil(const ImVec2 size)
{
return ImGui::IsRectVisible(size);
@@ -1352,7 +1352,7 @@ CIMGUI_API int igGetFrameCount()
{
return ImGui::GetFrameCount();
}
CIMGUI_API ImDrawList* igGetBackgroundDrawList()
CIMGUI_API ImDrawList* igGetBackgroundDrawListNil()
{
return ImGui::GetBackgroundDrawList();
}
@@ -2412,6 +2412,22 @@ CIMGUI_API bool ImFont_IsGlyphRangeUnused(ImFont* self,unsigned int c_begin,unsi
{
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 ImGuiID igImHashData(const void* data,size_t data_size,ImU32 seed)
{
return ImHashData(data,data_size,seed);
@@ -2904,6 +2920,10 @@ CIMGUI_API void ImDrawDataBuilder_ClearFreeMemory(ImDrawDataBuilder* self)
{
return self->ClearFreeMemory();
}
CIMGUI_API int ImDrawDataBuilder_GetDrawListCount(ImDrawDataBuilder* self)
{
return self->GetDrawListCount();
}
CIMGUI_API void ImDrawDataBuilder_FlattenIntoSingleLayer(ImDrawDataBuilder* self)
{
return self->FlattenIntoSingleLayer();
@@ -3064,6 +3084,26 @@ CIMGUI_API void ImGuiOldColumns_destroy(ImGuiOldColumns* self)
{
IM_DELETE(self);
}
CIMGUI_API ImGuiViewportP* ImGuiViewportP_ImGuiViewportP(void)
{
return IM_NEW(ImGuiViewportP)();
}
CIMGUI_API void ImGuiViewportP_destroy(ImGuiViewportP* self)
{
IM_DELETE(self);
}
CIMGUI_API void ImGuiViewportP_GetMainRect(ImRect *pOut,ImGuiViewportP* self)
{
*pOut = self->GetMainRect();
}
CIMGUI_API void ImGuiViewportP_GetWorkRect(ImRect *pOut,ImGuiViewportP* self)
{
*pOut = self->GetWorkRect();
}
CIMGUI_API void ImGuiViewportP_UpdateWorkRect(ImGuiViewportP* self)
{
return self->UpdateWorkRect();
}
CIMGUI_API ImGuiWindowSettings* ImGuiWindowSettings_ImGuiWindowSettings(void)
{
return IM_NEW(ImGuiWindowSettings)();
@@ -3348,6 +3388,14 @@ CIMGUI_API ImDrawList* igGetForegroundDrawListWindowPtr(ImGuiWindow* window)
{
return ImGui::GetForegroundDrawList(window);
}
CIMGUI_API ImDrawList* igGetBackgroundDrawListViewportPtr(ImGuiViewport* viewport)
{
return ImGui::GetBackgroundDrawList(viewport);
}
CIMGUI_API ImDrawList* igGetForegroundDrawListViewportPtr(ImGuiViewport* viewport)
{
return ImGui::GetForegroundDrawList(viewport);
}
CIMGUI_API void igInitialize(ImGuiContext* context)
{
return ImGui::Initialize(context);
@@ -3372,10 +3420,14 @@ CIMGUI_API void igUpdateMouseMovingWindowEndFrame()
{
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);
}
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)
{
return ImGui::CallContextHooks(context,type);
@@ -3560,6 +3612,14 @@ CIMGUI_API void igLogToBuffer(int 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)
{
return ImGui::BeginChildEx(name,id,size_arg,border,flags);
@@ -3752,6 +3812,10 @@ CIMGUI_API void igTableOpenContextMenu(int 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)
{
return ImGui::TableSetColumnWidth(column_n,width);
@@ -4000,10 +4064,6 @@ CIMGUI_API const char* igFindRenderedTextEnd(const char* text,const char* text_e
{
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)
{
return ImGui::RenderArrow(draw_list,pos,col,dir,scale);
@@ -4216,9 +4276,9 @@ CIMGUI_API void igDebugNodeDrawList(ImGuiWindow* window,const ImDrawList* draw_l
{
return ImGui::DebugNodeDrawList(window,draw_list,label);
}
CIMGUI_API void igDebugNodeDrawCmdShowMeshAndBoundingBox(ImGuiWindow* window,const ImDrawList* draw_list,const ImDrawCmd* draw_cmd,bool show_mesh,bool show_aabb)
CIMGUI_API void igDebugNodeDrawCmdShowMeshAndBoundingBox(ImDrawList* out_draw_list,const ImDrawList* draw_list,const ImDrawCmd* draw_cmd,bool show_mesh,bool show_aabb)
{
return ImGui::DebugNodeDrawCmdShowMeshAndBoundingBox(window,draw_list,draw_cmd,show_mesh,show_aabb);
return ImGui::DebugNodeDrawCmdShowMeshAndBoundingBox(out_draw_list,draw_list,draw_cmd,show_mesh,show_aabb);
}
CIMGUI_API void igDebugNodeStorage(ImGuiStorage* storage,const char* label)
{
@@ -4248,9 +4308,17 @@ CIMGUI_API void igDebugNodeWindowsList(ImVector_ImGuiWindowPtr* windows,const ch
{
return ImGui::DebugNodeWindowsList(windows,label);
}
CIMGUI_API bool igImFontAtlasBuildWithStbTruetype(ImFontAtlas* atlas)
CIMGUI_API void igDebugNodeViewport(ImGuiViewportP* viewport)
{
return ImFontAtlasBuildWithStbTruetype(atlas);
return ImGui::DebugNodeViewport(viewport);
}
CIMGUI_API void igDebugRenderViewportThumbnail(ImDrawList* draw_list,ImGuiViewportP* viewport,const ImRect bb)
{
return ImGui::DebugRenderViewportThumbnail(draw_list,viewport,bb);
}
CIMGUI_API const ImFontBuilderIO* igImFontAtlasGetBuilderForStbTruetype()
{
return ImFontAtlasGetBuilderForStbTruetype();
}
CIMGUI_API void igImFontAtlasBuildInit(ImFontAtlas* atlas)
{
@@ -4268,9 +4336,13 @@ CIMGUI_API void igImFontAtlasBuildFinish(ImFontAtlas* 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)
{