pull imgui 1.68

This commit is contained in:
sonoro1234
2019-02-19 13:11:06 +01:00
parent 806ff124a1
commit 666a687e0f
11 changed files with 404 additions and 287 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.67" from Dear ImGui https://github.com/ocornut/imgui
//based on imgui.h file version "1.68" from Dear ImGui https://github.com/ocornut/imgui
#include "./imgui/imgui.h"
#include "cimgui.h"
@@ -1211,6 +1211,10 @@ CIMGUI_API bool igIsItemEdited()
{
return ImGui::IsItemEdited();
}
CIMGUI_API bool igIsItemActivated()
{
return ImGui::IsItemActivated();
}
CIMGUI_API bool igIsItemDeactivated()
{
return ImGui::IsItemDeactivated();
@@ -1603,6 +1607,10 @@ CIMGUI_API const char* ImGuiTextBuffer_c_str(ImGuiTextBuffer* self)
{
return self->c_str();
}
CIMGUI_API void ImGuiTextBuffer_append(ImGuiTextBuffer* self,const char* str,const char* str_end)
{
return self->append(str,str_end);
}
CIMGUI_API void ImGuiTextBuffer_appendfv(ImGuiTextBuffer* self,const char* fmt,va_list args)
{
return self->appendfv(fmt,args);
@@ -1971,9 +1979,9 @@ CIMGUI_API void ImDrawData_DeIndexAllBuffers(ImDrawData* self)
{
return self->DeIndexAllBuffers();
}
CIMGUI_API void ImDrawData_ScaleClipRects(ImDrawData* self,const ImVec2 sc)
CIMGUI_API void ImDrawData_ScaleClipRects(ImDrawData* self,const ImVec2 fb_scale)
{
return self->ScaleClipRects(sc);
return self->ScaleClipRects(fb_scale);
}
CIMGUI_API ImFontConfig* ImFontConfig_ImFontConfig(void)
{
@@ -2151,14 +2159,6 @@ CIMGUI_API void ImFont_destroy(ImFont* self)
{
IM_DELETE(self);
}
CIMGUI_API void ImFont_ClearOutputData(ImFont* self)
{
return self->ClearOutputData();
}
CIMGUI_API void ImFont_BuildLookupTable(ImFont* self)
{
return self->BuildLookupTable();
}
CIMGUI_API const ImFontGlyph* ImFont_FindGlyph(ImFont* self,ImWchar c)
{
return self->FindGlyph(c);
@@ -2167,10 +2167,6 @@ CIMGUI_API const ImFontGlyph* ImFont_FindGlyphNoFallback(ImFont* self,ImWchar c)
{
return self->FindGlyphNoFallback(c);
}
CIMGUI_API void ImFont_SetFallbackChar(ImFont* self,ImWchar c)
{
return self->SetFallbackChar(c);
}
CIMGUI_API float ImFont_GetCharAdvance(ImFont* self,ImWchar c)
{
return self->GetCharAdvance(c);
@@ -2199,6 +2195,14 @@ CIMGUI_API void ImFont_RenderText(ImFont* self,ImDrawList* draw_list,float size,
{
return self->RenderText(draw_list,size,pos,col,clip_rect,text_begin,text_end,wrap_width,cpu_fine_clip);
}
CIMGUI_API void ImFont_BuildLookupTable(ImFont* self)
{
return self->BuildLookupTable();
}
CIMGUI_API void ImFont_ClearOutputData(ImFont* self)
{
return self->ClearOutputData();
}
CIMGUI_API void ImFont_GrowIndex(ImFont* self,int new_size)
{
return self->GrowIndex(new_size);
@@ -2211,6 +2215,10 @@ CIMGUI_API void ImFont_AddRemapChar(ImFont* self,ImWchar dst,ImWchar src,bool ov
{
return self->AddRemapChar(dst,src,overwrite_dst);
}
CIMGUI_API void ImFont_SetFallbackChar(ImFont* self,ImWchar c)
{
return self->SetFallbackChar(c);
}
CIMGUI_API void igGetWindowPos_nonUDT(ImVec2 *pOut)
{
*pOut = ImGui::GetWindowPos();