pull imgui 1.69 and generate

This commit is contained in:
sonoro1234
2019-03-13 17:05:22 +01:00
parent bc6f6e664e
commit 4be0522d9f
12 changed files with 564 additions and 274 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.68" from Dear ImGui https://github.com/ocornut/imgui
//based on imgui.h file version "1.69" from Dear ImGui https://github.com/ocornut/imgui
#include "./imgui/imgui.h"
#include "cimgui.h"
@@ -764,6 +764,10 @@ CIMGUI_API bool igInputTextMultiline(const char* label,char* buf,size_t buf_size
{
return ImGui::InputTextMultiline(label,buf,buf_size,size,flags,callback,user_data);
}
CIMGUI_API bool igInputTextWithHint(const char* label,const char* hint,char* buf,size_t buf_size,ImGuiInputTextFlags flags,ImGuiInputTextCallback callback,void* user_data)
{
return ImGui::InputTextWithHint(label,hint,buf,buf_size,flags,callback,user_data);
}
CIMGUI_API bool igInputFloat(const char* label,float* v,float step,float step_fast,const char* format,ImGuiInputTextFlags flags)
{
return ImGui::InputFloat(label,v,step,step_fast,format,flags);
@@ -1123,17 +1127,17 @@ CIMGUI_API void igSetTabItemClosed(const char* tab_or_docked_window_label)
{
return ImGui::SetTabItemClosed(tab_or_docked_window_label);
}
CIMGUI_API void igLogToTTY(int max_depth)
CIMGUI_API void igLogToTTY(int auto_open_depth)
{
return ImGui::LogToTTY(max_depth);
return ImGui::LogToTTY(auto_open_depth);
}
CIMGUI_API void igLogToFile(int max_depth,const char* filename)
CIMGUI_API void igLogToFile(int auto_open_depth,const char* filename)
{
return ImGui::LogToFile(max_depth,filename);
return ImGui::LogToFile(auto_open_depth,filename);
}
CIMGUI_API void igLogToClipboard(int max_depth)
CIMGUI_API void igLogToClipboard(int auto_open_depth)
{
return ImGui::LogToClipboard(max_depth);
return ImGui::LogToClipboard(auto_open_depth);
}
CIMGUI_API void igLogFinish()
{
@@ -1147,9 +1151,9 @@ CIMGUI_API bool igBeginDragDropSource(ImGuiDragDropFlags flags)
{
return ImGui::BeginDragDropSource(flags);
}
CIMGUI_API bool igSetDragDropPayload(const char* type,const void* data,size_t size,ImGuiCond cond)
CIMGUI_API bool igSetDragDropPayload(const char* type,const void* data,size_t sz,ImGuiCond cond)
{
return ImGui::SetDragDropPayload(type,data,size,cond);
return ImGui::SetDragDropPayload(type,data,sz,cond);
}
CIMGUI_API void igEndDragDropSource()
{
@@ -1267,9 +1271,13 @@ CIMGUI_API int igGetFrameCount()
{
return ImGui::GetFrameCount();
}
CIMGUI_API ImDrawList* igGetOverlayDrawList()
CIMGUI_API ImDrawList* igGetBackgroundDrawList()
{
return ImGui::GetOverlayDrawList();
return ImGui::GetBackgroundDrawList();
}
CIMGUI_API ImDrawList* igGetForegroundDrawList()
{
return ImGui::GetForegroundDrawList();
}
CIMGUI_API ImDrawListSharedData* igGetDrawListSharedData()
{
@@ -1847,11 +1855,11 @@ CIMGUI_API void ImDrawList_AddImageRounded(ImDrawList* self,ImTextureID user_tex
{
return self->AddImageRounded(user_texture_id,a,b,uv_a,uv_b,col,rounding,rounding_corners);
}
CIMGUI_API void ImDrawList_AddPolyline(ImDrawList* self,const ImVec2* points,const int num_points,ImU32 col,bool closed,float thickness)
CIMGUI_API void ImDrawList_AddPolyline(ImDrawList* self,const ImVec2* points,int num_points,ImU32 col,bool closed,float thickness)
{
return self->AddPolyline(points,num_points,col,closed,thickness);
}
CIMGUI_API void ImDrawList_AddConvexPolyFilled(ImDrawList* self,const ImVec2* points,const int num_points,ImU32 col)
CIMGUI_API void ImDrawList_AddConvexPolyFilled(ImDrawList* self,const ImVec2* points,int num_points,ImU32 col)
{
return self->AddConvexPolyFilled(points,num_points,col);
}
@@ -2119,6 +2127,10 @@ CIMGUI_API const ImWchar* ImFontAtlas_GetGlyphRangesThai(ImFontAtlas* self)
{
return self->GetGlyphRangesThai();
}
CIMGUI_API const ImWchar* ImFontAtlas_GetGlyphRangesVietnamese(ImFontAtlas* self)
{
return self->GetGlyphRangesVietnamese();
}
CIMGUI_API CustomRect* CustomRect_CustomRect(void)
{
return IM_NEW(CustomRect)();