pull imgui 1.70 and generate

This commit is contained in:
sonoro1234
2019-05-06 15:59:27 +02:00
parent 648cf587c9
commit 1aeb9ad132
10 changed files with 210 additions and 184 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.69" from Dear ImGui https://github.com/ocornut/imgui
//based on imgui.h file version "1.70" from Dear ImGui https://github.com/ocornut/imgui
#include "./imgui/imgui.h"
#include "cimgui.h"
@@ -46,9 +46,9 @@ CIMGUI_API void igSetCurrentContext(ImGuiContext* ctx)
{
return ImGui::SetCurrentContext(ctx);
}
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)
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)
{
return ImGui::DebugCheckVersionAndDataLayout(version_str,sz_io,sz_style,sz_vec2,sz_vec4,sz_drawvert);
return ImGui::DebugCheckVersionAndDataLayout(version_str,sz_io,sz_style,sz_vec2,sz_vec4,sz_drawvert,sz_drawidx);
}
CIMGUI_API ImGuiIO* igGetIO()
{
@@ -174,30 +174,6 @@ CIMGUI_API float igGetWindowHeight()
{
return ImGui::GetWindowHeight();
}
CIMGUI_API ImVec2 igGetContentRegionMax()
{
return ImGui::GetContentRegionMax();
}
CIMGUI_API ImVec2 igGetContentRegionAvail()
{
return ImGui::GetContentRegionAvail();
}
CIMGUI_API float igGetContentRegionAvailWidth()
{
return ImGui::GetContentRegionAvailWidth();
}
CIMGUI_API ImVec2 igGetWindowContentRegionMin()
{
return ImGui::GetWindowContentRegionMin();
}
CIMGUI_API ImVec2 igGetWindowContentRegionMax()
{
return ImGui::GetWindowContentRegionMax();
}
CIMGUI_API float igGetWindowContentRegionWidth()
{
return ImGui::GetWindowContentRegionWidth();
}
CIMGUI_API void igSetNextWindowPos(const ImVec2 pos,ImGuiCond cond,const ImVec2 pivot)
{
return ImGui::SetNextWindowPos(pos,cond,pivot);
@@ -262,6 +238,26 @@ CIMGUI_API void igSetWindowFocusStr(const char* name)
{
return ImGui::SetWindowFocus(name);
}
CIMGUI_API ImVec2 igGetContentRegionMax()
{
return ImGui::GetContentRegionMax();
}
CIMGUI_API ImVec2 igGetContentRegionAvail()
{
return ImGui::GetContentRegionAvail();
}
CIMGUI_API ImVec2 igGetWindowContentRegionMin()
{
return ImGui::GetWindowContentRegionMin();
}
CIMGUI_API ImVec2 igGetWindowContentRegionMax()
{
return ImGui::GetWindowContentRegionMax();
}
CIMGUI_API float igGetWindowContentRegionWidth()
{
return ImGui::GetWindowContentRegionWidth();
}
CIMGUI_API float igGetScrollX()
{
return ImGui::GetScrollX();
@@ -362,6 +358,10 @@ CIMGUI_API void igPopItemWidth()
{
return ImGui::PopItemWidth();
}
CIMGUI_API void igSetNextItemWidth(float item_width)
{
return ImGui::SetNextItemWidth(item_width);
}
CIMGUI_API float igCalcItemWidth()
{
return ImGui::CalcItemWidth();
@@ -394,9 +394,9 @@ CIMGUI_API void igSeparator()
{
return ImGui::Separator();
}
CIMGUI_API void igSameLine(float local_pos_x,float spacing_w)
CIMGUI_API void igSameLine(float offset_from_start_x,float spacing)
{
return ImGui::SameLine(local_pos_x,spacing_w);
return ImGui::SameLine(offset_from_start_x,spacing);
}
CIMGUI_API void igNewLine()
{