kennethnym/cimgui
1
0
Fork 0
mirror of https://github.com/cimgui/cimgui.git synced 2025-08-10 20:08:31 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update imgui submodule to 1.67 and re-generate.

Browse Source
This commit is contained in:
Eric Mellino
2019-01-14 18:42:10 -08:00
parent d2ee8fc7dd
commit b5c7ed5862
13 changed files with 1857 additions and 1274 deletions
Download Patch File Download Diff File Expand all files Collapse all files

174
cimgui.cpp
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.66b" from Dear ImGui https://github.com/ocornut/imgui
//based on imgui.h file version "1.67" from Dear ImGui https://github.com/ocornut/imgui
#include "./imgui/imgui.h"
#include "cimgui.h"
@@ -290,9 +290,9 @@ CIMGUI_API void igSetScrollHereY(float center_y_ratio)
{
return ImGui::SetScrollHereY(center_y_ratio);
}
CIMGUI_API void igSetScrollFromPosY(float pos_y,float center_y_ratio)
CIMGUI_API void igSetScrollFromPosY(float local_y,float center_y_ratio)
{
return ImGui::SetScrollFromPosY(pos_y,center_y_ratio);
return ImGui::SetScrollFromPosY(local_y,center_y_ratio);
}
CIMGUI_API void igPushFont(ImFont* font)
{
@@ -366,9 +366,9 @@ CIMGUI_API float igCalcItemWidth()
{
return ImGui::CalcItemWidth();
}
CIMGUI_API void igPushTextWrapPos(float wrap_pos_x)
CIMGUI_API void igPushTextWrapPos(float wrap_local_pos_x)
{
return ImGui::PushTextWrapPos(wrap_pos_x);
return ImGui::PushTextWrapPos(wrap_local_pos_x);
}
CIMGUI_API void igPopTextWrapPos()
{
@@ -394,9 +394,9 @@ CIMGUI_API void igSeparator()
{
return ImGui::Separator();
}
CIMGUI_API void igSameLine(float pos_x,float spacing_w)
CIMGUI_API void igSameLine(float local_pos_x,float spacing_w)
{
return ImGui::SameLine(pos_x,spacing_w);
return ImGui::SameLine(local_pos_x,spacing_w);
}
CIMGUI_API void igNewLine()
{
@@ -442,13 +442,13 @@ CIMGUI_API void igSetCursorPos(const ImVec2 local_pos)
{
return ImGui::SetCursorPos(local_pos);
}
CIMGUI_API void igSetCursorPosX(float x)
CIMGUI_API void igSetCursorPosX(float local_x)
{
return ImGui::SetCursorPosX(x);
return ImGui::SetCursorPosX(local_x);
}
CIMGUI_API void igSetCursorPosY(float y)
CIMGUI_API void igSetCursorPosY(float local_y)
{
return ImGui::SetCursorPosY(y);
return ImGui::SetCursorPosY(local_y);
}
CIMGUI_API ImVec2 igGetCursorStartPos()
{
@@ -458,9 +458,9 @@ CIMGUI_API ImVec2 igGetCursorScreenPos()
{
return ImGui::GetCursorScreenPos();
}
CIMGUI_API void igSetCursorScreenPos(const ImVec2 screen_pos)
CIMGUI_API void igSetCursorScreenPos(const ImVec2 pos)
{
return ImGui::SetCursorScreenPos(screen_pos);
return ImGui::SetCursorScreenPos(pos);
}
CIMGUI_API void igAlignTextToFramePadding()
{
@@ -764,49 +764,49 @@ 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 igInputFloat(const char* label,float* v,float step,float step_fast,const char* format,ImGuiInputTextFlags extra_flags)
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,extra_flags);
return ImGui::InputFloat(label,v,step,step_fast,format,flags);
}
CIMGUI_API bool igInputFloat2(const char* label,float v[2],const char* format,ImGuiInputTextFlags extra_flags)
CIMGUI_API bool igInputFloat2(const char* label,float v[2],const char* format,ImGuiInputTextFlags flags)
{
return ImGui::InputFloat2(label,v,format,extra_flags);
return ImGui::InputFloat2(label,v,format,flags);
}
CIMGUI_API bool igInputFloat3(const char* label,float v[3],const char* format,ImGuiInputTextFlags extra_flags)
CIMGUI_API bool igInputFloat3(const char* label,float v[3],const char* format,ImGuiInputTextFlags flags)
{
return ImGui::InputFloat3(label,v,format,extra_flags);
return ImGui::InputFloat3(label,v,format,flags);
}
CIMGUI_API bool igInputFloat4(const char* label,float v[4],const char* format,ImGuiInputTextFlags extra_flags)
CIMGUI_API bool igInputFloat4(const char* label,float v[4],const char* format,ImGuiInputTextFlags flags)
{
return ImGui::InputFloat4(label,v,format,extra_flags);
return ImGui::InputFloat4(label,v,format,flags);
}
CIMGUI_API bool igInputInt(const char* label,int* v,int step,int step_fast,ImGuiInputTextFlags extra_flags)
CIMGUI_API bool igInputInt(const char* label,int* v,int step,int step_fast,ImGuiInputTextFlags flags)
{
return ImGui::InputInt(label,v,step,step_fast,extra_flags);
return ImGui::InputInt(label,v,step,step_fast,flags);
}
CIMGUI_API bool igInputInt2(const char* label,int v[2],ImGuiInputTextFlags extra_flags)
CIMGUI_API bool igInputInt2(const char* label,int v[2],ImGuiInputTextFlags flags)
{
return ImGui::InputInt2(label,v,extra_flags);
return ImGui::InputInt2(label,v,flags);
}
CIMGUI_API bool igInputInt3(const char* label,int v[3],ImGuiInputTextFlags extra_flags)
CIMGUI_API bool igInputInt3(const char* label,int v[3],ImGuiInputTextFlags flags)
{
return ImGui::InputInt3(label,v,extra_flags);
return ImGui::InputInt3(label,v,flags);
}
CIMGUI_API bool igInputInt4(const char* label,int v[4],ImGuiInputTextFlags extra_flags)
CIMGUI_API bool igInputInt4(const char* label,int v[4],ImGuiInputTextFlags flags)
{
return ImGui::InputInt4(label,v,extra_flags);
return ImGui::InputInt4(label,v,flags);
}
CIMGUI_API bool igInputDouble(const char* label,double* v,double step,double step_fast,const char* format,ImGuiInputTextFlags extra_flags)
CIMGUI_API bool igInputDouble(const char* label,double* v,double step,double step_fast,const char* format,ImGuiInputTextFlags flags)
{
return ImGui::InputDouble(label,v,step,step_fast,format,extra_flags);
return ImGui::InputDouble(label,v,step,step_fast,format,flags);
}
CIMGUI_API bool igInputScalar(const char* label,ImGuiDataType data_type,void* v,const void* step,const void* step_fast,const char* format,ImGuiInputTextFlags extra_flags)
CIMGUI_API bool igInputScalar(const char* label,ImGuiDataType data_type,void* v,const void* step,const void* step_fast,const char* format,ImGuiInputTextFlags flags)
{
return ImGui::InputScalar(label,data_type,v,step,step_fast,format,extra_flags);
return ImGui::InputScalar(label,data_type,v,step,step_fast,format,flags);
}
CIMGUI_API bool igInputScalarN(const char* label,ImGuiDataType data_type,void* v,int components,const void* step,const void* step_fast,const char* format,ImGuiInputTextFlags extra_flags)
CIMGUI_API bool igInputScalarN(const char* label,ImGuiDataType data_type,void* v,int components,const void* step,const void* step_fast,const char* format,ImGuiInputTextFlags flags)
{
return ImGui::InputScalarN(label,data_type,v,components,step,step_fast,format,extra_flags);
return ImGui::InputScalarN(label,data_type,v,components,step,step_fast,format,flags);
}
CIMGUI_API bool igColorEdit3(const char* label,float col[3],ImGuiColorEditFlags flags)
{
@@ -1103,6 +1103,26 @@ CIMGUI_API int igGetColumnsCount()
{
return ImGui::GetColumnsCount();
}
CIMGUI_API bool igBeginTabBar(const char* str_id,ImGuiTabBarFlags flags)
{
return ImGui::BeginTabBar(str_id,flags);
}
CIMGUI_API void igEndTabBar()
{
return ImGui::EndTabBar();
}
CIMGUI_API bool igBeginTabItem(const char* label,bool* p_open,ImGuiTabItemFlags flags)
{
return ImGui::BeginTabItem(label,p_open,flags);
}
CIMGUI_API void igEndTabItem()
{
return ImGui::EndTabItem();
}
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)
{
return ImGui::LogToTTY(max_depth);
@@ -1363,13 +1383,13 @@ CIMGUI_API void igSetMouseCursor(ImGuiMouseCursor type)
{
return ImGui::SetMouseCursor(type);
}
CIMGUI_API void igCaptureKeyboardFromApp(bool capture)
CIMGUI_API void igCaptureKeyboardFromApp(bool want_capture_keyboard_value)
{
return ImGui::CaptureKeyboardFromApp(capture);
return ImGui::CaptureKeyboardFromApp(want_capture_keyboard_value);
}
CIMGUI_API void igCaptureMouseFromApp(bool capture)
CIMGUI_API void igCaptureMouseFromApp(bool want_capture_mouse_value)
{
return ImGui::CaptureMouseFromApp(capture);
return ImGui::CaptureMouseFromApp(want_capture_mouse_value);
}
CIMGUI_API const char* igGetClipboardText()
{
@@ -1423,9 +1443,9 @@ CIMGUI_API void ImGuiIO_AddInputCharacter(ImGuiIO* self,ImWchar c)
{
return self->AddInputCharacter(c);
}
CIMGUI_API void ImGuiIO_AddInputCharactersUTF8(ImGuiIO* self,const char* utf8_chars)
CIMGUI_API void ImGuiIO_AddInputCharactersUTF8(ImGuiIO* self,const char* str)
{
return self->AddInputCharactersUTF8(utf8_chars);
return self->AddInputCharactersUTF8(str);
}
CIMGUI_API void ImGuiIO_ClearInputCharacters(ImGuiIO* self)
{
@@ -1963,6 +1983,38 @@ CIMGUI_API void ImFontConfig_destroy(ImFontConfig* self)
{
IM_DELETE(self);
}
CIMGUI_API ImFontGlyphRangesBuilder* ImFontGlyphRangesBuilder_ImFontGlyphRangesBuilder(void)
{
return IM_NEW(ImFontGlyphRangesBuilder)();
}
CIMGUI_API void ImFontGlyphRangesBuilder_destroy(ImFontGlyphRangesBuilder* self)
{
IM_DELETE(self);
}
CIMGUI_API bool ImFontGlyphRangesBuilder_GetBit(ImFontGlyphRangesBuilder* self,int n)
{
return self->GetBit(n);
}
CIMGUI_API void ImFontGlyphRangesBuilder_SetBit(ImFontGlyphRangesBuilder* self,int n)
{
return self->SetBit(n);
}
CIMGUI_API void ImFontGlyphRangesBuilder_AddChar(ImFontGlyphRangesBuilder* self,ImWchar c)
{
return self->AddChar(c);
}
CIMGUI_API void ImFontGlyphRangesBuilder_AddText(ImFontGlyphRangesBuilder* self,const char* text,const char* text_end)
{
return self->AddText(text,text_end);
}
CIMGUI_API void ImFontGlyphRangesBuilder_AddRanges(ImFontGlyphRangesBuilder* self,const ImWchar* ranges)
{
return self->AddRanges(ranges);
}
CIMGUI_API void ImFontGlyphRangesBuilder_BuildRanges(ImFontGlyphRangesBuilder* self,ImVector_ImWchar* out_ranges)
{
return self->BuildRanges(out_ranges);
}
CIMGUI_API ImFontAtlas* ImFontAtlas_ImFontAtlas(void)
{
return IM_NEW(ImFontAtlas)();
@@ -2015,10 +2067,6 @@ CIMGUI_API bool ImFontAtlas_Build(ImFontAtlas* self)
{
return self->Build();
}
CIMGUI_API bool ImFontAtlas_IsBuilt(ImFontAtlas* self)
{
return self->IsBuilt();
}
CIMGUI_API void ImFontAtlas_GetTexDataAsAlpha8(ImFontAtlas* self,unsigned char** out_pixels,int* out_width,int* out_height,int* out_bytes_per_pixel)
{
return self->GetTexDataAsAlpha8(out_pixels,out_width,out_height,out_bytes_per_pixel);
@@ -2027,6 +2075,10 @@ CIMGUI_API void ImFontAtlas_GetTexDataAsRGBA32(ImFontAtlas* self,unsigned char**
{
return self->GetTexDataAsRGBA32(out_pixels,out_width,out_height,out_bytes_per_pixel);
}
CIMGUI_API bool ImFontAtlas_IsBuilt(ImFontAtlas* self)
{
return self->IsBuilt();
}
CIMGUI_API void ImFontAtlas_SetTexID(ImFontAtlas* self,ImTextureID id)
{
return self->SetTexID(id);
@@ -2059,38 +2111,6 @@ CIMGUI_API const ImWchar* ImFontAtlas_GetGlyphRangesThai(ImFontAtlas* self)
{
return self->GetGlyphRangesThai();
}
CIMGUI_API GlyphRangesBuilder* GlyphRangesBuilder_GlyphRangesBuilder(void)
{
return IM_NEW(GlyphRangesBuilder)();
}
CIMGUI_API void GlyphRangesBuilder_destroy(GlyphRangesBuilder* self)
{
IM_DELETE(self);
}
CIMGUI_API bool GlyphRangesBuilder_GetBit(GlyphRangesBuilder* self,int n)
{
return self->GetBit(n);
}
CIMGUI_API void GlyphRangesBuilder_SetBit(GlyphRangesBuilder* self,int n)
{
return self->SetBit(n);
}
CIMGUI_API void GlyphRangesBuilder_AddChar(GlyphRangesBuilder* self,ImWchar c)
{
return self->AddChar(c);
}
CIMGUI_API void GlyphRangesBuilder_AddText(GlyphRangesBuilder* self,const char* text,const char* text_end)
{
return self->AddText(text,text_end);
}
CIMGUI_API void GlyphRangesBuilder_AddRanges(GlyphRangesBuilder* self,const ImWchar* ranges)
{
return self->AddRanges(ranges);
}
CIMGUI_API void GlyphRangesBuilder_BuildRanges(GlyphRangesBuilder* self,ImVector_ImWchar* out_ranges)
{
return self->BuildRanges(out_ranges);
}
CIMGUI_API CustomRect* CustomRect_CustomRect(void)
{
return IM_NEW(CustomRect)();