pull ImGui 1.74 and generation

This commit is contained in:
sonoro1234
2019-11-26 10:02:00 +01:00
parent e3cbc0119e
commit 3a7d0d46f8
11 changed files with 300 additions and 224 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.73" from Dear ImGui https://github.com/ocornut/imgui
//based on imgui.h file version "1.74" from Dear ImGui https://github.com/ocornut/imgui
#include "./imgui/imgui.h"
#include "./imgui/imgui_internal.h"
@@ -701,13 +701,13 @@ CIMGUI_API bool igDragIntRange2(const char* label,int* v_current_min,int* v_curr
{
return ImGui::DragIntRange2(label,v_current_min,v_current_max,v_speed,v_min,v_max,format,format_max);
}
CIMGUI_API bool igDragScalar(const char* label,ImGuiDataType data_type,void* v,float v_speed,const void* v_min,const void* v_max,const char* format,float power)
CIMGUI_API bool igDragScalar(const char* label,ImGuiDataType data_type,void* p_data,float v_speed,const void* p_min,const void* p_max,const char* format,float power)
{
return ImGui::DragScalar(label,data_type,v,v_speed,v_min,v_max,format,power);
return ImGui::DragScalar(label,data_type,p_data,v_speed,p_min,p_max,format,power);
}
CIMGUI_API bool igDragScalarN(const char* label,ImGuiDataType data_type,void* v,int components,float v_speed,const void* v_min,const void* v_max,const char* format,float power)
CIMGUI_API bool igDragScalarN(const char* label,ImGuiDataType data_type,void* p_data,int components,float v_speed,const void* p_min,const void* p_max,const char* format,float power)
{
return ImGui::DragScalarN(label,data_type,v,components,v_speed,v_min,v_max,format,power);
return ImGui::DragScalarN(label,data_type,p_data,components,v_speed,p_min,p_max,format,power);
}
CIMGUI_API bool igSliderFloat(const char* label,float* v,float v_min,float v_max,const char* format,float power)
{
@@ -745,13 +745,13 @@ CIMGUI_API bool igSliderInt4(const char* label,int v[4],int v_min,int v_max,cons
{
return ImGui::SliderInt4(label,v,v_min,v_max,format);
}
CIMGUI_API bool igSliderScalar(const char* label,ImGuiDataType data_type,void* v,const void* v_min,const void* v_max,const char* format,float power)
CIMGUI_API bool igSliderScalar(const char* label,ImGuiDataType data_type,void* p_data,const void* p_min,const void* p_max,const char* format,float power)
{
return ImGui::SliderScalar(label,data_type,v,v_min,v_max,format,power);
return ImGui::SliderScalar(label,data_type,p_data,p_min,p_max,format,power);
}
CIMGUI_API bool igSliderScalarN(const char* label,ImGuiDataType data_type,void* v,int components,const void* v_min,const void* v_max,const char* format,float power)
CIMGUI_API bool igSliderScalarN(const char* label,ImGuiDataType data_type,void* p_data,int components,const void* p_min,const void* p_max,const char* format,float power)
{
return ImGui::SliderScalarN(label,data_type,v,components,v_min,v_max,format,power);
return ImGui::SliderScalarN(label,data_type,p_data,components,p_min,p_max,format,power);
}
CIMGUI_API bool igVSliderFloat(const char* label,const ImVec2 size,float* v,float v_min,float v_max,const char* format,float power)
{
@@ -761,9 +761,9 @@ CIMGUI_API bool igVSliderInt(const char* label,const ImVec2 size,int* v,int v_mi
{
return ImGui::VSliderInt(label,size,v,v_min,v_max,format);
}
CIMGUI_API bool igVSliderScalar(const char* label,const ImVec2 size,ImGuiDataType data_type,void* v,const void* v_min,const void* v_max,const char* format,float power)
CIMGUI_API bool igVSliderScalar(const char* label,const ImVec2 size,ImGuiDataType data_type,void* p_data,const void* p_min,const void* p_max,const char* format,float power)
{
return ImGui::VSliderScalar(label,size,data_type,v,v_min,v_max,format,power);
return ImGui::VSliderScalar(label,size,data_type,p_data,p_min,p_max,format,power);
}
CIMGUI_API bool igInputText(const char* label,char* buf,size_t buf_size,ImGuiInputTextFlags flags,ImGuiInputTextCallback callback,void* user_data)
{
@@ -813,13 +813,13 @@ CIMGUI_API bool igInputDouble(const char* label,double* v,double step,double ste
{
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 flags)
CIMGUI_API bool igInputScalar(const char* label,ImGuiDataType data_type,void* p_data,const void* p_step,const void* p_step_fast,const char* format,ImGuiInputTextFlags flags)
{
return ImGui::InputScalar(label,data_type,v,step,step_fast,format,flags);
return ImGui::InputScalar(label,data_type,p_data,p_step,p_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 flags)
CIMGUI_API bool igInputScalarN(const char* label,ImGuiDataType data_type,void* p_data,int components,const void* p_step,const void* p_step_fast,const char* format,ImGuiInputTextFlags flags)
{
return ImGui::InputScalarN(label,data_type,v,components,step,step_fast,format,flags);
return ImGui::InputScalarN(label,data_type,p_data,components,p_step,p_step_fast,format,flags);
}
CIMGUI_API bool igColorEdit3(const char* label,float col[3],ImGuiColorEditFlags flags)
{
@@ -989,14 +989,6 @@ CIMGUI_API void igValueFloat(const char* prefix,float v,const char* float_format
{
return ImGui::Value(prefix,v,float_format);
}
CIMGUI_API bool igBeginMainMenuBar()
{
return ImGui::BeginMainMenuBar();
}
CIMGUI_API void igEndMainMenuBar()
{
return ImGui::EndMainMenuBar();
}
CIMGUI_API bool igBeginMenuBar()
{
return ImGui::BeginMenuBar();
@@ -1005,6 +997,14 @@ CIMGUI_API void igEndMenuBar()
{
return ImGui::EndMenuBar();
}
CIMGUI_API bool igBeginMainMenuBar()
{
return ImGui::BeginMainMenuBar();
}
CIMGUI_API void igEndMainMenuBar()
{
return ImGui::EndMainMenuBar();
}
CIMGUI_API bool igBeginMenu(const char* label,bool enabled)
{
return ImGui::BeginMenu(label,enabled);
@@ -1232,6 +1232,10 @@ CIMGUI_API bool igIsItemDeactivatedAfterEdit()
{
return ImGui::IsItemDeactivatedAfterEdit();
}
CIMGUI_API bool igIsItemToggledOpen()
{
return ImGui::IsItemToggledOpen();
}
CIMGUI_API bool igIsAnyItemHovered()
{
return ImGui::IsAnyItemHovered();