From 3a7d0d46f8b85060da6d59ee379abd1948f6f908 Mon Sep 17 00:00:00 2001 From: sonoro1234 Date: Tue, 26 Nov 2019 10:02:00 +0100 Subject: [PATCH] pull ImGui 1.74 and generation --- README.md | 2 +- cimgui.cpp | 50 ++++---- cimgui.h | 22 ++-- generator/output/cimgui.cpp | 50 ++++---- generator/output/cimgui.h | 22 ++-- generator/output/definitions.json | 151 +++++++++++++++--------- generator/output/definitions.lua | 148 ++++++++++++++--------- generator/output/overloads.txt | 30 ++--- generator/output/structs_and_enums.json | 21 ++-- generator/output/structs_and_enums.lua | 26 ++-- imgui | 2 +- 11 files changed, 300 insertions(+), 224 deletions(-) diff --git a/README.md b/README.md index ce16029..f674a8c 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@ History: Initially cimgui was developed by Stephan Dilly as hand-written code but lately turned into an auto-generated version by sonoro1234 in order to keep up with imgui more easily (letting the user select the desired branch and commit) Notes: -* currently this wrapper is based on version [1.73 of Dear ImGui] +* currently this wrapper is based on version [1.74 of Dear ImGui] * only functions, structs and enums from imgui.h are wrapped. * if you are interested in imgui implementations you should look LuaJIT-ImGui project. * overloaded function names try to be the most compatible with traditional cimgui names. So all naming is algorithmic except for those names that were in conflict with widely used cimgui names and were thus coded in a table (https://github.com/cimgui/cimgui/blob/master/generator/generator.lua#L58). Current overloaded function names can be found in (https://github.com/cimgui/cimgui/blob/master/generator/output/overloads.txt) diff --git a/cimgui.cpp b/cimgui.cpp index 6cbf3d8..0f174a1 100644 --- a/cimgui.cpp +++ b/cimgui.cpp @@ -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(); diff --git a/cimgui.h b/cimgui.h index a64ad0f..b05a0ce 100644 --- a/cimgui.h +++ b/cimgui.h @@ -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 #ifndef CIMGUI_INCLUDED #define CIMGUI_INCLUDED #include @@ -384,7 +384,6 @@ enum ImGuiNavInput_ ImGuiNavInput_TweakSlow, ImGuiNavInput_TweakFast, ImGuiNavInput_KeyMenu_, - ImGuiNavInput_KeyTab_, ImGuiNavInput_KeyLeft_, ImGuiNavInput_KeyRight_, ImGuiNavInput_KeyUp_, @@ -1109,8 +1108,8 @@ CIMGUI_API bool igDragInt2(const char* label,int v[2],float v_speed,int v_min,in CIMGUI_API bool igDragInt3(const char* label,int v[3],float v_speed,int v_min,int v_max,const char* format); CIMGUI_API bool igDragInt4(const char* label,int v[4],float v_speed,int v_min,int v_max,const char* format); CIMGUI_API bool igDragIntRange2(const char* label,int* v_current_min,int* v_current_max,float v_speed,int v_min,int v_max,const char* format,const char* 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 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 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); +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); CIMGUI_API bool igSliderFloat(const char* label,float* v,float v_min,float v_max,const char* format,float power); CIMGUI_API bool igSliderFloat2(const char* label,float v[2],float v_min,float v_max,const char* format,float power); CIMGUI_API bool igSliderFloat3(const char* label,float v[3],float v_min,float v_max,const char* format,float power); @@ -1120,11 +1119,11 @@ CIMGUI_API bool igSliderInt(const char* label,int* v,int v_min,int v_max,const c CIMGUI_API bool igSliderInt2(const char* label,int v[2],int v_min,int v_max,const char* format); CIMGUI_API bool igSliderInt3(const char* label,int v[3],int v_min,int v_max,const char* format); CIMGUI_API bool igSliderInt4(const char* label,int v[4],int v_min,int v_max,const char* 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 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 igSliderScalar(const char* label,ImGuiDataType data_type,void* p_data,const void* p_min,const void* p_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); CIMGUI_API bool igVSliderFloat(const char* label,const ImVec2 size,float* v,float v_min,float v_max,const char* format,float power); CIMGUI_API bool igVSliderInt(const char* label,const ImVec2 size,int* v,int v_min,int v_max,const char* 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); CIMGUI_API bool igInputText(const char* label,char* buf,size_t buf_size,ImGuiInputTextFlags flags,ImGuiInputTextCallback callback,void* user_data); CIMGUI_API bool igInputTextMultiline(const char* label,char* buf,size_t buf_size,const ImVec2 size,ImGuiInputTextFlags flags,ImGuiInputTextCallback callback,void* 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); @@ -1137,8 +1136,8 @@ CIMGUI_API bool igInputInt2(const char* label,int v[2],ImGuiInputTextFlags flags CIMGUI_API bool igInputInt3(const char* label,int v[3],ImGuiInputTextFlags flags); CIMGUI_API bool igInputInt4(const char* label,int v[4],ImGuiInputTextFlags flags); CIMGUI_API bool igInputDouble(const char* label,double* v,double step,double step_fast,const char* format,ImGuiInputTextFlags 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 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 igInputScalar(const char* label,ImGuiDataType data_type,void* p_data,const void* p_step,const void* p_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); CIMGUI_API bool igColorEdit3(const char* label,float col[3],ImGuiColorEditFlags flags); CIMGUI_API bool igColorEdit4(const char* label,float col[4],ImGuiColorEditFlags flags); CIMGUI_API bool igColorPicker3(const char* label,float col[3],ImGuiColorEditFlags flags); @@ -1177,10 +1176,10 @@ CIMGUI_API void igValueBool(const char* prefix,bool b); CIMGUI_API void igValueInt(const char* prefix,int v); CIMGUI_API void igValueUint(const char* prefix,unsigned int v); CIMGUI_API void igValueFloat(const char* prefix,float v,const char* float_format); -CIMGUI_API bool igBeginMainMenuBar(void); -CIMGUI_API void igEndMainMenuBar(void); CIMGUI_API bool igBeginMenuBar(void); CIMGUI_API void igEndMenuBar(void); +CIMGUI_API bool igBeginMainMenuBar(void); +CIMGUI_API void igEndMainMenuBar(void); CIMGUI_API bool igBeginMenu(const char* label,bool enabled); CIMGUI_API void igEndMenu(void); CIMGUI_API bool igMenuItemBool(const char* label,const char* shortcut,bool selected,bool enabled); @@ -1237,6 +1236,7 @@ CIMGUI_API bool igIsItemEdited(void); CIMGUI_API bool igIsItemActivated(void); CIMGUI_API bool igIsItemDeactivated(void); CIMGUI_API bool igIsItemDeactivatedAfterEdit(void); +CIMGUI_API bool igIsItemToggledOpen(void); CIMGUI_API bool igIsAnyItemHovered(void); CIMGUI_API bool igIsAnyItemActive(void); CIMGUI_API bool igIsAnyItemFocused(void); diff --git a/generator/output/cimgui.cpp b/generator/output/cimgui.cpp index 6cbf3d8..0f174a1 100644 --- a/generator/output/cimgui.cpp +++ b/generator/output/cimgui.cpp @@ -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(); diff --git a/generator/output/cimgui.h b/generator/output/cimgui.h index a64ad0f..b05a0ce 100644 --- a/generator/output/cimgui.h +++ b/generator/output/cimgui.h @@ -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 #ifndef CIMGUI_INCLUDED #define CIMGUI_INCLUDED #include @@ -384,7 +384,6 @@ enum ImGuiNavInput_ ImGuiNavInput_TweakSlow, ImGuiNavInput_TweakFast, ImGuiNavInput_KeyMenu_, - ImGuiNavInput_KeyTab_, ImGuiNavInput_KeyLeft_, ImGuiNavInput_KeyRight_, ImGuiNavInput_KeyUp_, @@ -1109,8 +1108,8 @@ CIMGUI_API bool igDragInt2(const char* label,int v[2],float v_speed,int v_min,in CIMGUI_API bool igDragInt3(const char* label,int v[3],float v_speed,int v_min,int v_max,const char* format); CIMGUI_API bool igDragInt4(const char* label,int v[4],float v_speed,int v_min,int v_max,const char* format); CIMGUI_API bool igDragIntRange2(const char* label,int* v_current_min,int* v_current_max,float v_speed,int v_min,int v_max,const char* format,const char* 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 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 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); +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); CIMGUI_API bool igSliderFloat(const char* label,float* v,float v_min,float v_max,const char* format,float power); CIMGUI_API bool igSliderFloat2(const char* label,float v[2],float v_min,float v_max,const char* format,float power); CIMGUI_API bool igSliderFloat3(const char* label,float v[3],float v_min,float v_max,const char* format,float power); @@ -1120,11 +1119,11 @@ CIMGUI_API bool igSliderInt(const char* label,int* v,int v_min,int v_max,const c CIMGUI_API bool igSliderInt2(const char* label,int v[2],int v_min,int v_max,const char* format); CIMGUI_API bool igSliderInt3(const char* label,int v[3],int v_min,int v_max,const char* format); CIMGUI_API bool igSliderInt4(const char* label,int v[4],int v_min,int v_max,const char* 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 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 igSliderScalar(const char* label,ImGuiDataType data_type,void* p_data,const void* p_min,const void* p_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); CIMGUI_API bool igVSliderFloat(const char* label,const ImVec2 size,float* v,float v_min,float v_max,const char* format,float power); CIMGUI_API bool igVSliderInt(const char* label,const ImVec2 size,int* v,int v_min,int v_max,const char* 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); CIMGUI_API bool igInputText(const char* label,char* buf,size_t buf_size,ImGuiInputTextFlags flags,ImGuiInputTextCallback callback,void* user_data); CIMGUI_API bool igInputTextMultiline(const char* label,char* buf,size_t buf_size,const ImVec2 size,ImGuiInputTextFlags flags,ImGuiInputTextCallback callback,void* 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); @@ -1137,8 +1136,8 @@ CIMGUI_API bool igInputInt2(const char* label,int v[2],ImGuiInputTextFlags flags CIMGUI_API bool igInputInt3(const char* label,int v[3],ImGuiInputTextFlags flags); CIMGUI_API bool igInputInt4(const char* label,int v[4],ImGuiInputTextFlags flags); CIMGUI_API bool igInputDouble(const char* label,double* v,double step,double step_fast,const char* format,ImGuiInputTextFlags 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 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 igInputScalar(const char* label,ImGuiDataType data_type,void* p_data,const void* p_step,const void* p_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); CIMGUI_API bool igColorEdit3(const char* label,float col[3],ImGuiColorEditFlags flags); CIMGUI_API bool igColorEdit4(const char* label,float col[4],ImGuiColorEditFlags flags); CIMGUI_API bool igColorPicker3(const char* label,float col[3],ImGuiColorEditFlags flags); @@ -1177,10 +1176,10 @@ CIMGUI_API void igValueBool(const char* prefix,bool b); CIMGUI_API void igValueInt(const char* prefix,int v); CIMGUI_API void igValueUint(const char* prefix,unsigned int v); CIMGUI_API void igValueFloat(const char* prefix,float v,const char* float_format); -CIMGUI_API bool igBeginMainMenuBar(void); -CIMGUI_API void igEndMainMenuBar(void); CIMGUI_API bool igBeginMenuBar(void); CIMGUI_API void igEndMenuBar(void); +CIMGUI_API bool igBeginMainMenuBar(void); +CIMGUI_API void igEndMainMenuBar(void); CIMGUI_API bool igBeginMenu(const char* label,bool enabled); CIMGUI_API void igEndMenu(void); CIMGUI_API bool igMenuItemBool(const char* label,const char* shortcut,bool selected,bool enabled); @@ -1237,6 +1236,7 @@ CIMGUI_API bool igIsItemEdited(void); CIMGUI_API bool igIsItemActivated(void); CIMGUI_API bool igIsItemDeactivated(void); CIMGUI_API bool igIsItemDeactivatedAfterEdit(void); +CIMGUI_API bool igIsItemToggledOpen(void); CIMGUI_API bool igIsAnyItemHovered(void); CIMGUI_API bool igIsAnyItemActive(void); CIMGUI_API bool igIsAnyItemFocused(void); diff --git a/generator/output/definitions.json b/generator/output/definitions.json index 4091900..e02bb7d 100644 --- a/generator/output/definitions.json +++ b/generator/output/definitions.json @@ -2792,7 +2792,7 @@ "funcname": "CalcCustomRectUV", "ov_cimguiname": "ImFontAtlas_CalcCustomRectUV", "ret": "void", - "signature": "(const ImFontAtlasCustomRect*,ImVec2*,ImVec2*)", + "signature": "(const ImFontAtlasCustomRect*,ImVec2*,ImVec2*)const", "stname": "ImFontAtlas" } ], @@ -3207,7 +3207,7 @@ "funcname": "IsBuilt", "ov_cimguiname": "ImFontAtlas_IsBuilt", "ret": "bool", - "signature": "()", + "signature": "()const", "stname": "ImFontAtlas" } ], @@ -5338,7 +5338,7 @@ "funcname": "empty", "ov_cimguiname": "ImGuiTextBuffer_empty", "ret": "bool", - "signature": "()", + "signature": "()const", "stname": "ImGuiTextBuffer" } ], @@ -6501,6 +6501,31 @@ "templated": true } ], + "ImVector_shrink": [ + { + "args": "(ImVector* self,int new_size)", + "argsT": [ + { + "name": "self", + "type": "ImVector*" + }, + { + "name": "new_size", + "type": "int" + } + ], + "argsoriginal": "(int new_size)", + "call_args": "(new_size)", + "cimguiname": "ImVector_shrink", + "defaults": [], + "funcname": "shrink", + "ov_cimguiname": "ImVector_shrink", + "ret": "void", + "signature": "(int)", + "stname": "ImVector", + "templated": true + } + ], "ImVector_size": [ { "args": "(ImVector* self)", @@ -8648,7 +8673,7 @@ ], "igDragScalar": [ { - "args": "(const char* label,ImGuiDataType data_type,void* v,float v_speed,const void* v_min,const void* v_max,const char* format,float power)", + "args": "(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)", "argsT": [ { "name": "label", @@ -8659,7 +8684,7 @@ "type": "ImGuiDataType" }, { - "name": "v", + "name": "p_data", "type": "void*" }, { @@ -8667,11 +8692,11 @@ "type": "float" }, { - "name": "v_min", + "name": "p_min", "type": "const void*" }, { - "name": "v_max", + "name": "p_max", "type": "const void*" }, { @@ -8683,14 +8708,14 @@ "type": "float" } ], - "argsoriginal": "(const char* label,ImGuiDataType data_type,void* v,float v_speed,const void* v_min=((void*)0),const void* v_max=((void*)0),const char* format=((void*)0),float power=1.0f)", - "call_args": "(label,data_type,v,v_speed,v_min,v_max,format,power)", + "argsoriginal": "(const char* label,ImGuiDataType data_type,void* p_data,float v_speed,const void* p_min=((void*)0),const void* p_max=((void*)0),const char* format=((void*)0),float power=1.0f)", + "call_args": "(label,data_type,p_data,v_speed,p_min,p_max,format,power)", "cimguiname": "igDragScalar", "defaults": { "format": "((void*)0)", - "power": "1.0f", - "v_max": "((void*)0)", - "v_min": "((void*)0)" + "p_max": "((void*)0)", + "p_min": "((void*)0)", + "power": "1.0f" }, "funcname": "DragScalar", "namespace": "ImGui", @@ -8702,7 +8727,7 @@ ], "igDragScalarN": [ { - "args": "(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)", + "args": "(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)", "argsT": [ { "name": "label", @@ -8713,7 +8738,7 @@ "type": "ImGuiDataType" }, { - "name": "v", + "name": "p_data", "type": "void*" }, { @@ -8725,11 +8750,11 @@ "type": "float" }, { - "name": "v_min", + "name": "p_min", "type": "const void*" }, { - "name": "v_max", + "name": "p_max", "type": "const void*" }, { @@ -8741,14 +8766,14 @@ "type": "float" } ], - "argsoriginal": "(const char* label,ImGuiDataType data_type,void* v,int components,float v_speed,const void* v_min=((void*)0),const void* v_max=((void*)0),const char* format=((void*)0),float power=1.0f)", - "call_args": "(label,data_type,v,components,v_speed,v_min,v_max,format,power)", + "argsoriginal": "(const char* label,ImGuiDataType data_type,void* p_data,int components,float v_speed,const void* p_min=((void*)0),const void* p_max=((void*)0),const char* format=((void*)0),float power=1.0f)", + "call_args": "(label,data_type,p_data,components,v_speed,p_min,p_max,format,power)", "cimguiname": "igDragScalarN", "defaults": { "format": "((void*)0)", - "power": "1.0f", - "v_max": "((void*)0)", - "v_min": "((void*)0)" + "p_max": "((void*)0)", + "p_min": "((void*)0)", + "power": "1.0f" }, "funcname": "DragScalarN", "namespace": "ImGui", @@ -11139,7 +11164,7 @@ ], "igInputScalar": [ { - "args": "(const char* label,ImGuiDataType data_type,void* v,const void* step,const void* step_fast,const char* format,ImGuiInputTextFlags flags)", + "args": "(const char* label,ImGuiDataType data_type,void* p_data,const void* p_step,const void* p_step_fast,const char* format,ImGuiInputTextFlags flags)", "argsT": [ { "name": "label", @@ -11150,15 +11175,15 @@ "type": "ImGuiDataType" }, { - "name": "v", + "name": "p_data", "type": "void*" }, { - "name": "step", + "name": "p_step", "type": "const void*" }, { - "name": "step_fast", + "name": "p_step_fast", "type": "const void*" }, { @@ -11170,14 +11195,14 @@ "type": "ImGuiInputTextFlags" } ], - "argsoriginal": "(const char* label,ImGuiDataType data_type,void* v,const void* step=((void*)0),const void* step_fast=((void*)0),const char* format=((void*)0),ImGuiInputTextFlags flags=0)", - "call_args": "(label,data_type,v,step,step_fast,format,flags)", + "argsoriginal": "(const char* label,ImGuiDataType data_type,void* p_data,const void* p_step=((void*)0),const void* p_step_fast=((void*)0),const char* format=((void*)0),ImGuiInputTextFlags flags=0)", + "call_args": "(label,data_type,p_data,p_step,p_step_fast,format,flags)", "cimguiname": "igInputScalar", "defaults": { "flags": "0", "format": "((void*)0)", - "step": "((void*)0)", - "step_fast": "((void*)0)" + "p_step": "((void*)0)", + "p_step_fast": "((void*)0)" }, "funcname": "InputScalar", "namespace": "ImGui", @@ -11189,7 +11214,7 @@ ], "igInputScalarN": [ { - "args": "(const char* label,ImGuiDataType data_type,void* v,int components,const void* step,const void* step_fast,const char* format,ImGuiInputTextFlags flags)", + "args": "(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)", "argsT": [ { "name": "label", @@ -11200,7 +11225,7 @@ "type": "ImGuiDataType" }, { - "name": "v", + "name": "p_data", "type": "void*" }, { @@ -11208,11 +11233,11 @@ "type": "int" }, { - "name": "step", + "name": "p_step", "type": "const void*" }, { - "name": "step_fast", + "name": "p_step_fast", "type": "const void*" }, { @@ -11224,14 +11249,14 @@ "type": "ImGuiInputTextFlags" } ], - "argsoriginal": "(const char* label,ImGuiDataType data_type,void* v,int components,const void* step=((void*)0),const void* step_fast=((void*)0),const char* format=((void*)0),ImGuiInputTextFlags flags=0)", - "call_args": "(label,data_type,v,components,step,step_fast,format,flags)", + "argsoriginal": "(const char* label,ImGuiDataType data_type,void* p_data,int components,const void* p_step=((void*)0),const void* p_step_fast=((void*)0),const char* format=((void*)0),ImGuiInputTextFlags flags=0)", + "call_args": "(label,data_type,p_data,components,p_step,p_step_fast,format,flags)", "cimguiname": "igInputScalarN", "defaults": { "flags": "0", "format": "((void*)0)", - "step": "((void*)0)", - "step_fast": "((void*)0)" + "p_step": "((void*)0)", + "p_step_fast": "((void*)0)" }, "funcname": "InputScalarN", "namespace": "ImGui", @@ -11616,6 +11641,22 @@ "stname": "" } ], + "igIsItemToggledOpen": [ + { + "args": "()", + "argsT": [], + "argsoriginal": "()", + "call_args": "()", + "cimguiname": "igIsItemToggledOpen", + "defaults": [], + "funcname": "IsItemToggledOpen", + "namespace": "ImGui", + "ov_cimguiname": "igIsItemToggledOpen", + "ret": "bool", + "signature": "()", + "stname": "" + } + ], "igIsItemVisible": [ { "args": "()", @@ -15166,7 +15207,7 @@ ], "igSliderScalar": [ { - "args": "(const char* label,ImGuiDataType data_type,void* v,const void* v_min,const void* v_max,const char* format,float power)", + "args": "(const char* label,ImGuiDataType data_type,void* p_data,const void* p_min,const void* p_max,const char* format,float power)", "argsT": [ { "name": "label", @@ -15177,15 +15218,15 @@ "type": "ImGuiDataType" }, { - "name": "v", + "name": "p_data", "type": "void*" }, { - "name": "v_min", + "name": "p_min", "type": "const void*" }, { - "name": "v_max", + "name": "p_max", "type": "const void*" }, { @@ -15197,8 +15238,8 @@ "type": "float" } ], - "argsoriginal": "(const char* label,ImGuiDataType data_type,void* v,const void* v_min,const void* v_max,const char* format=((void*)0),float power=1.0f)", - "call_args": "(label,data_type,v,v_min,v_max,format,power)", + "argsoriginal": "(const char* label,ImGuiDataType data_type,void* p_data,const void* p_min,const void* p_max,const char* format=((void*)0),float power=1.0f)", + "call_args": "(label,data_type,p_data,p_min,p_max,format,power)", "cimguiname": "igSliderScalar", "defaults": { "format": "((void*)0)", @@ -15214,7 +15255,7 @@ ], "igSliderScalarN": [ { - "args": "(const char* label,ImGuiDataType data_type,void* v,int components,const void* v_min,const void* v_max,const char* format,float power)", + "args": "(const char* label,ImGuiDataType data_type,void* p_data,int components,const void* p_min,const void* p_max,const char* format,float power)", "argsT": [ { "name": "label", @@ -15225,7 +15266,7 @@ "type": "ImGuiDataType" }, { - "name": "v", + "name": "p_data", "type": "void*" }, { @@ -15233,11 +15274,11 @@ "type": "int" }, { - "name": "v_min", + "name": "p_min", "type": "const void*" }, { - "name": "v_max", + "name": "p_max", "type": "const void*" }, { @@ -15249,8 +15290,8 @@ "type": "float" } ], - "argsoriginal": "(const char* label,ImGuiDataType data_type,void* v,int components,const void* v_min,const void* v_max,const char* format=((void*)0),float power=1.0f)", - "call_args": "(label,data_type,v,components,v_min,v_max,format,power)", + "argsoriginal": "(const char* label,ImGuiDataType data_type,void* p_data,int components,const void* p_min,const void* p_max,const char* format=((void*)0),float power=1.0f)", + "call_args": "(label,data_type,p_data,components,p_min,p_max,format,power)", "cimguiname": "igSliderScalarN", "defaults": { "format": "((void*)0)", @@ -16071,7 +16112,7 @@ ], "igVSliderScalar": [ { - "args": "(const char* label,const ImVec2 size,ImGuiDataType data_type,void* v,const void* v_min,const void* v_max,const char* format,float power)", + "args": "(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)", "argsT": [ { "name": "label", @@ -16086,15 +16127,15 @@ "type": "ImGuiDataType" }, { - "name": "v", + "name": "p_data", "type": "void*" }, { - "name": "v_min", + "name": "p_min", "type": "const void*" }, { - "name": "v_max", + "name": "p_max", "type": "const void*" }, { @@ -16106,8 +16147,8 @@ "type": "float" } ], - "argsoriginal": "(const char* label,const ImVec2& size,ImGuiDataType data_type,void* v,const void* v_min,const void* v_max,const char* format=((void*)0),float power=1.0f)", - "call_args": "(label,size,data_type,v,v_min,v_max,format,power)", + "argsoriginal": "(const char* label,const ImVec2& size,ImGuiDataType data_type,void* p_data,const void* p_min,const void* p_max,const char* format=((void*)0),float power=1.0f)", + "call_args": "(label,size,data_type,p_data,p_min,p_max,format,power)", "cimguiname": "igVSliderScalar", "defaults": { "format": "((void*)0)", diff --git a/generator/output/definitions.lua b/generator/output/definitions.lua index f01db53..82de056 100644 --- a/generator/output/definitions.lua +++ b/generator/output/definitions.lua @@ -2279,9 +2279,9 @@ defs["ImFontAtlas_CalcCustomRectUV"][1]["defaults"] = {} defs["ImFontAtlas_CalcCustomRectUV"][1]["funcname"] = "CalcCustomRectUV" defs["ImFontAtlas_CalcCustomRectUV"][1]["ov_cimguiname"] = "ImFontAtlas_CalcCustomRectUV" defs["ImFontAtlas_CalcCustomRectUV"][1]["ret"] = "void" -defs["ImFontAtlas_CalcCustomRectUV"][1]["signature"] = "(const ImFontAtlasCustomRect*,ImVec2*,ImVec2*)" +defs["ImFontAtlas_CalcCustomRectUV"][1]["signature"] = "(const ImFontAtlasCustomRect*,ImVec2*,ImVec2*)const" defs["ImFontAtlas_CalcCustomRectUV"][1]["stname"] = "ImFontAtlas" -defs["ImFontAtlas_CalcCustomRectUV"]["(const ImFontAtlasCustomRect*,ImVec2*,ImVec2*)"] = defs["ImFontAtlas_CalcCustomRectUV"][1] +defs["ImFontAtlas_CalcCustomRectUV"]["(const ImFontAtlasCustomRect*,ImVec2*,ImVec2*)const"] = defs["ImFontAtlas_CalcCustomRectUV"][1] defs["ImFontAtlas_Clear"] = {} defs["ImFontAtlas_Clear"][1] = {} defs["ImFontAtlas_Clear"][1]["args"] = "(ImFontAtlas* self)" @@ -2626,9 +2626,9 @@ defs["ImFontAtlas_IsBuilt"][1]["defaults"] = {} defs["ImFontAtlas_IsBuilt"][1]["funcname"] = "IsBuilt" defs["ImFontAtlas_IsBuilt"][1]["ov_cimguiname"] = "ImFontAtlas_IsBuilt" defs["ImFontAtlas_IsBuilt"][1]["ret"] = "bool" -defs["ImFontAtlas_IsBuilt"][1]["signature"] = "()" +defs["ImFontAtlas_IsBuilt"][1]["signature"] = "()const" defs["ImFontAtlas_IsBuilt"][1]["stname"] = "ImFontAtlas" -defs["ImFontAtlas_IsBuilt"]["()"] = defs["ImFontAtlas_IsBuilt"][1] +defs["ImFontAtlas_IsBuilt"]["()const"] = defs["ImFontAtlas_IsBuilt"][1] defs["ImFontAtlas_SetTexID"] = {} defs["ImFontAtlas_SetTexID"][1] = {} defs["ImFontAtlas_SetTexID"][1]["args"] = "(ImFontAtlas* self,ImTextureID id)" @@ -4392,9 +4392,9 @@ defs["ImGuiTextBuffer_empty"][1]["defaults"] = {} defs["ImGuiTextBuffer_empty"][1]["funcname"] = "empty" defs["ImGuiTextBuffer_empty"][1]["ov_cimguiname"] = "ImGuiTextBuffer_empty" defs["ImGuiTextBuffer_empty"][1]["ret"] = "bool" -defs["ImGuiTextBuffer_empty"][1]["signature"] = "()" +defs["ImGuiTextBuffer_empty"][1]["signature"] = "()const" defs["ImGuiTextBuffer_empty"][1]["stname"] = "ImGuiTextBuffer" -defs["ImGuiTextBuffer_empty"]["()"] = defs["ImGuiTextBuffer_empty"][1] +defs["ImGuiTextBuffer_empty"]["()const"] = defs["ImGuiTextBuffer_empty"][1] defs["ImGuiTextBuffer_end"] = {} defs["ImGuiTextBuffer_end"][1] = {} defs["ImGuiTextBuffer_end"][1]["args"] = "(ImGuiTextBuffer* self)" @@ -5383,6 +5383,27 @@ defs["ImVector_resize"][2]["stname"] = "ImVector" defs["ImVector_resize"][2]["templated"] = true defs["ImVector_resize"]["(int)"] = defs["ImVector_resize"][1] defs["ImVector_resize"]["(int,const T)"] = defs["ImVector_resize"][2] +defs["ImVector_shrink"] = {} +defs["ImVector_shrink"][1] = {} +defs["ImVector_shrink"][1]["args"] = "(ImVector* self,int new_size)" +defs["ImVector_shrink"][1]["argsT"] = {} +defs["ImVector_shrink"][1]["argsT"][1] = {} +defs["ImVector_shrink"][1]["argsT"][1]["name"] = "self" +defs["ImVector_shrink"][1]["argsT"][1]["type"] = "ImVector*" +defs["ImVector_shrink"][1]["argsT"][2] = {} +defs["ImVector_shrink"][1]["argsT"][2]["name"] = "new_size" +defs["ImVector_shrink"][1]["argsT"][2]["type"] = "int" +defs["ImVector_shrink"][1]["argsoriginal"] = "(int new_size)" +defs["ImVector_shrink"][1]["call_args"] = "(new_size)" +defs["ImVector_shrink"][1]["cimguiname"] = "ImVector_shrink" +defs["ImVector_shrink"][1]["defaults"] = {} +defs["ImVector_shrink"][1]["funcname"] = "shrink" +defs["ImVector_shrink"][1]["ov_cimguiname"] = "ImVector_shrink" +defs["ImVector_shrink"][1]["ret"] = "void" +defs["ImVector_shrink"][1]["signature"] = "(int)" +defs["ImVector_shrink"][1]["stname"] = "ImVector" +defs["ImVector_shrink"][1]["templated"] = true +defs["ImVector_shrink"]["(int)"] = defs["ImVector_shrink"][1] defs["ImVector_size"] = {} defs["ImVector_size"][1] = {} defs["ImVector_size"][1]["args"] = "(ImVector* self)" @@ -7149,7 +7170,7 @@ defs["igDragIntRange2"][1]["stname"] = "" defs["igDragIntRange2"]["(const char*,int*,int*,float,int,int,const char*,const char*)"] = defs["igDragIntRange2"][1] defs["igDragScalar"] = {} defs["igDragScalar"][1] = {} -defs["igDragScalar"][1]["args"] = "(const char* label,ImGuiDataType data_type,void* v,float v_speed,const void* v_min,const void* v_max,const char* format,float power)" +defs["igDragScalar"][1]["args"] = "(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)" defs["igDragScalar"][1]["argsT"] = {} defs["igDragScalar"][1]["argsT"][1] = {} defs["igDragScalar"][1]["argsT"][1]["name"] = "label" @@ -7158,16 +7179,16 @@ defs["igDragScalar"][1]["argsT"][2] = {} defs["igDragScalar"][1]["argsT"][2]["name"] = "data_type" defs["igDragScalar"][1]["argsT"][2]["type"] = "ImGuiDataType" defs["igDragScalar"][1]["argsT"][3] = {} -defs["igDragScalar"][1]["argsT"][3]["name"] = "v" +defs["igDragScalar"][1]["argsT"][3]["name"] = "p_data" defs["igDragScalar"][1]["argsT"][3]["type"] = "void*" defs["igDragScalar"][1]["argsT"][4] = {} defs["igDragScalar"][1]["argsT"][4]["name"] = "v_speed" defs["igDragScalar"][1]["argsT"][4]["type"] = "float" defs["igDragScalar"][1]["argsT"][5] = {} -defs["igDragScalar"][1]["argsT"][5]["name"] = "v_min" +defs["igDragScalar"][1]["argsT"][5]["name"] = "p_min" defs["igDragScalar"][1]["argsT"][5]["type"] = "const void*" defs["igDragScalar"][1]["argsT"][6] = {} -defs["igDragScalar"][1]["argsT"][6]["name"] = "v_max" +defs["igDragScalar"][1]["argsT"][6]["name"] = "p_max" defs["igDragScalar"][1]["argsT"][6]["type"] = "const void*" defs["igDragScalar"][1]["argsT"][7] = {} defs["igDragScalar"][1]["argsT"][7]["name"] = "format" @@ -7175,14 +7196,14 @@ defs["igDragScalar"][1]["argsT"][7]["type"] = "const char*" defs["igDragScalar"][1]["argsT"][8] = {} defs["igDragScalar"][1]["argsT"][8]["name"] = "power" defs["igDragScalar"][1]["argsT"][8]["type"] = "float" -defs["igDragScalar"][1]["argsoriginal"] = "(const char* label,ImGuiDataType data_type,void* v,float v_speed,const void* v_min=((void*)0),const void* v_max=((void*)0),const char* format=((void*)0),float power=1.0f)" -defs["igDragScalar"][1]["call_args"] = "(label,data_type,v,v_speed,v_min,v_max,format,power)" +defs["igDragScalar"][1]["argsoriginal"] = "(const char* label,ImGuiDataType data_type,void* p_data,float v_speed,const void* p_min=((void*)0),const void* p_max=((void*)0),const char* format=((void*)0),float power=1.0f)" +defs["igDragScalar"][1]["call_args"] = "(label,data_type,p_data,v_speed,p_min,p_max,format,power)" defs["igDragScalar"][1]["cimguiname"] = "igDragScalar" defs["igDragScalar"][1]["defaults"] = {} defs["igDragScalar"][1]["defaults"]["format"] = "((void*)0)" +defs["igDragScalar"][1]["defaults"]["p_max"] = "((void*)0)" +defs["igDragScalar"][1]["defaults"]["p_min"] = "((void*)0)" defs["igDragScalar"][1]["defaults"]["power"] = "1.0f" -defs["igDragScalar"][1]["defaults"]["v_max"] = "((void*)0)" -defs["igDragScalar"][1]["defaults"]["v_min"] = "((void*)0)" defs["igDragScalar"][1]["funcname"] = "DragScalar" defs["igDragScalar"][1]["namespace"] = "ImGui" defs["igDragScalar"][1]["ov_cimguiname"] = "igDragScalar" @@ -7192,7 +7213,7 @@ defs["igDragScalar"][1]["stname"] = "" defs["igDragScalar"]["(const char*,ImGuiDataType,void*,float,const void*,const void*,const char*,float)"] = defs["igDragScalar"][1] defs["igDragScalarN"] = {} defs["igDragScalarN"][1] = {} -defs["igDragScalarN"][1]["args"] = "(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)" +defs["igDragScalarN"][1]["args"] = "(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)" defs["igDragScalarN"][1]["argsT"] = {} defs["igDragScalarN"][1]["argsT"][1] = {} defs["igDragScalarN"][1]["argsT"][1]["name"] = "label" @@ -7201,7 +7222,7 @@ defs["igDragScalarN"][1]["argsT"][2] = {} defs["igDragScalarN"][1]["argsT"][2]["name"] = "data_type" defs["igDragScalarN"][1]["argsT"][2]["type"] = "ImGuiDataType" defs["igDragScalarN"][1]["argsT"][3] = {} -defs["igDragScalarN"][1]["argsT"][3]["name"] = "v" +defs["igDragScalarN"][1]["argsT"][3]["name"] = "p_data" defs["igDragScalarN"][1]["argsT"][3]["type"] = "void*" defs["igDragScalarN"][1]["argsT"][4] = {} defs["igDragScalarN"][1]["argsT"][4]["name"] = "components" @@ -7210,10 +7231,10 @@ defs["igDragScalarN"][1]["argsT"][5] = {} defs["igDragScalarN"][1]["argsT"][5]["name"] = "v_speed" defs["igDragScalarN"][1]["argsT"][5]["type"] = "float" defs["igDragScalarN"][1]["argsT"][6] = {} -defs["igDragScalarN"][1]["argsT"][6]["name"] = "v_min" +defs["igDragScalarN"][1]["argsT"][6]["name"] = "p_min" defs["igDragScalarN"][1]["argsT"][6]["type"] = "const void*" defs["igDragScalarN"][1]["argsT"][7] = {} -defs["igDragScalarN"][1]["argsT"][7]["name"] = "v_max" +defs["igDragScalarN"][1]["argsT"][7]["name"] = "p_max" defs["igDragScalarN"][1]["argsT"][7]["type"] = "const void*" defs["igDragScalarN"][1]["argsT"][8] = {} defs["igDragScalarN"][1]["argsT"][8]["name"] = "format" @@ -7221,14 +7242,14 @@ defs["igDragScalarN"][1]["argsT"][8]["type"] = "const char*" defs["igDragScalarN"][1]["argsT"][9] = {} defs["igDragScalarN"][1]["argsT"][9]["name"] = "power" defs["igDragScalarN"][1]["argsT"][9]["type"] = "float" -defs["igDragScalarN"][1]["argsoriginal"] = "(const char* label,ImGuiDataType data_type,void* v,int components,float v_speed,const void* v_min=((void*)0),const void* v_max=((void*)0),const char* format=((void*)0),float power=1.0f)" -defs["igDragScalarN"][1]["call_args"] = "(label,data_type,v,components,v_speed,v_min,v_max,format,power)" +defs["igDragScalarN"][1]["argsoriginal"] = "(const char* label,ImGuiDataType data_type,void* p_data,int components,float v_speed,const void* p_min=((void*)0),const void* p_max=((void*)0),const char* format=((void*)0),float power=1.0f)" +defs["igDragScalarN"][1]["call_args"] = "(label,data_type,p_data,components,v_speed,p_min,p_max,format,power)" defs["igDragScalarN"][1]["cimguiname"] = "igDragScalarN" defs["igDragScalarN"][1]["defaults"] = {} defs["igDragScalarN"][1]["defaults"]["format"] = "((void*)0)" +defs["igDragScalarN"][1]["defaults"]["p_max"] = "((void*)0)" +defs["igDragScalarN"][1]["defaults"]["p_min"] = "((void*)0)" defs["igDragScalarN"][1]["defaults"]["power"] = "1.0f" -defs["igDragScalarN"][1]["defaults"]["v_max"] = "((void*)0)" -defs["igDragScalarN"][1]["defaults"]["v_min"] = "((void*)0)" defs["igDragScalarN"][1]["funcname"] = "DragScalarN" defs["igDragScalarN"][1]["namespace"] = "ImGui" defs["igDragScalarN"][1]["ov_cimguiname"] = "igDragScalarN" @@ -9376,7 +9397,7 @@ defs["igInputInt4"][1]["stname"] = "" defs["igInputInt4"]["(const char*,int[4],ImGuiInputTextFlags)"] = defs["igInputInt4"][1] defs["igInputScalar"] = {} defs["igInputScalar"][1] = {} -defs["igInputScalar"][1]["args"] = "(const char* label,ImGuiDataType data_type,void* v,const void* step,const void* step_fast,const char* format,ImGuiInputTextFlags flags)" +defs["igInputScalar"][1]["args"] = "(const char* label,ImGuiDataType data_type,void* p_data,const void* p_step,const void* p_step_fast,const char* format,ImGuiInputTextFlags flags)" defs["igInputScalar"][1]["argsT"] = {} defs["igInputScalar"][1]["argsT"][1] = {} defs["igInputScalar"][1]["argsT"][1]["name"] = "label" @@ -9385,13 +9406,13 @@ defs["igInputScalar"][1]["argsT"][2] = {} defs["igInputScalar"][1]["argsT"][2]["name"] = "data_type" defs["igInputScalar"][1]["argsT"][2]["type"] = "ImGuiDataType" defs["igInputScalar"][1]["argsT"][3] = {} -defs["igInputScalar"][1]["argsT"][3]["name"] = "v" +defs["igInputScalar"][1]["argsT"][3]["name"] = "p_data" defs["igInputScalar"][1]["argsT"][3]["type"] = "void*" defs["igInputScalar"][1]["argsT"][4] = {} -defs["igInputScalar"][1]["argsT"][4]["name"] = "step" +defs["igInputScalar"][1]["argsT"][4]["name"] = "p_step" defs["igInputScalar"][1]["argsT"][4]["type"] = "const void*" defs["igInputScalar"][1]["argsT"][5] = {} -defs["igInputScalar"][1]["argsT"][5]["name"] = "step_fast" +defs["igInputScalar"][1]["argsT"][5]["name"] = "p_step_fast" defs["igInputScalar"][1]["argsT"][5]["type"] = "const void*" defs["igInputScalar"][1]["argsT"][6] = {} defs["igInputScalar"][1]["argsT"][6]["name"] = "format" @@ -9399,14 +9420,14 @@ defs["igInputScalar"][1]["argsT"][6]["type"] = "const char*" defs["igInputScalar"][1]["argsT"][7] = {} defs["igInputScalar"][1]["argsT"][7]["name"] = "flags" defs["igInputScalar"][1]["argsT"][7]["type"] = "ImGuiInputTextFlags" -defs["igInputScalar"][1]["argsoriginal"] = "(const char* label,ImGuiDataType data_type,void* v,const void* step=((void*)0),const void* step_fast=((void*)0),const char* format=((void*)0),ImGuiInputTextFlags flags=0)" -defs["igInputScalar"][1]["call_args"] = "(label,data_type,v,step,step_fast,format,flags)" +defs["igInputScalar"][1]["argsoriginal"] = "(const char* label,ImGuiDataType data_type,void* p_data,const void* p_step=((void*)0),const void* p_step_fast=((void*)0),const char* format=((void*)0),ImGuiInputTextFlags flags=0)" +defs["igInputScalar"][1]["call_args"] = "(label,data_type,p_data,p_step,p_step_fast,format,flags)" defs["igInputScalar"][1]["cimguiname"] = "igInputScalar" defs["igInputScalar"][1]["defaults"] = {} defs["igInputScalar"][1]["defaults"]["flags"] = "0" defs["igInputScalar"][1]["defaults"]["format"] = "((void*)0)" -defs["igInputScalar"][1]["defaults"]["step"] = "((void*)0)" -defs["igInputScalar"][1]["defaults"]["step_fast"] = "((void*)0)" +defs["igInputScalar"][1]["defaults"]["p_step"] = "((void*)0)" +defs["igInputScalar"][1]["defaults"]["p_step_fast"] = "((void*)0)" defs["igInputScalar"][1]["funcname"] = "InputScalar" defs["igInputScalar"][1]["namespace"] = "ImGui" defs["igInputScalar"][1]["ov_cimguiname"] = "igInputScalar" @@ -9416,7 +9437,7 @@ defs["igInputScalar"][1]["stname"] = "" defs["igInputScalar"]["(const char*,ImGuiDataType,void*,const void*,const void*,const char*,ImGuiInputTextFlags)"] = defs["igInputScalar"][1] defs["igInputScalarN"] = {} defs["igInputScalarN"][1] = {} -defs["igInputScalarN"][1]["args"] = "(const char* label,ImGuiDataType data_type,void* v,int components,const void* step,const void* step_fast,const char* format,ImGuiInputTextFlags flags)" +defs["igInputScalarN"][1]["args"] = "(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)" defs["igInputScalarN"][1]["argsT"] = {} defs["igInputScalarN"][1]["argsT"][1] = {} defs["igInputScalarN"][1]["argsT"][1]["name"] = "label" @@ -9425,16 +9446,16 @@ defs["igInputScalarN"][1]["argsT"][2] = {} defs["igInputScalarN"][1]["argsT"][2]["name"] = "data_type" defs["igInputScalarN"][1]["argsT"][2]["type"] = "ImGuiDataType" defs["igInputScalarN"][1]["argsT"][3] = {} -defs["igInputScalarN"][1]["argsT"][3]["name"] = "v" +defs["igInputScalarN"][1]["argsT"][3]["name"] = "p_data" defs["igInputScalarN"][1]["argsT"][3]["type"] = "void*" defs["igInputScalarN"][1]["argsT"][4] = {} defs["igInputScalarN"][1]["argsT"][4]["name"] = "components" defs["igInputScalarN"][1]["argsT"][4]["type"] = "int" defs["igInputScalarN"][1]["argsT"][5] = {} -defs["igInputScalarN"][1]["argsT"][5]["name"] = "step" +defs["igInputScalarN"][1]["argsT"][5]["name"] = "p_step" defs["igInputScalarN"][1]["argsT"][5]["type"] = "const void*" defs["igInputScalarN"][1]["argsT"][6] = {} -defs["igInputScalarN"][1]["argsT"][6]["name"] = "step_fast" +defs["igInputScalarN"][1]["argsT"][6]["name"] = "p_step_fast" defs["igInputScalarN"][1]["argsT"][6]["type"] = "const void*" defs["igInputScalarN"][1]["argsT"][7] = {} defs["igInputScalarN"][1]["argsT"][7]["name"] = "format" @@ -9442,14 +9463,14 @@ defs["igInputScalarN"][1]["argsT"][7]["type"] = "const char*" defs["igInputScalarN"][1]["argsT"][8] = {} defs["igInputScalarN"][1]["argsT"][8]["name"] = "flags" defs["igInputScalarN"][1]["argsT"][8]["type"] = "ImGuiInputTextFlags" -defs["igInputScalarN"][1]["argsoriginal"] = "(const char* label,ImGuiDataType data_type,void* v,int components,const void* step=((void*)0),const void* step_fast=((void*)0),const char* format=((void*)0),ImGuiInputTextFlags flags=0)" -defs["igInputScalarN"][1]["call_args"] = "(label,data_type,v,components,step,step_fast,format,flags)" +defs["igInputScalarN"][1]["argsoriginal"] = "(const char* label,ImGuiDataType data_type,void* p_data,int components,const void* p_step=((void*)0),const void* p_step_fast=((void*)0),const char* format=((void*)0),ImGuiInputTextFlags flags=0)" +defs["igInputScalarN"][1]["call_args"] = "(label,data_type,p_data,components,p_step,p_step_fast,format,flags)" defs["igInputScalarN"][1]["cimguiname"] = "igInputScalarN" defs["igInputScalarN"][1]["defaults"] = {} defs["igInputScalarN"][1]["defaults"]["flags"] = "0" defs["igInputScalarN"][1]["defaults"]["format"] = "((void*)0)" -defs["igInputScalarN"][1]["defaults"]["step"] = "((void*)0)" -defs["igInputScalarN"][1]["defaults"]["step_fast"] = "((void*)0)" +defs["igInputScalarN"][1]["defaults"]["p_step"] = "((void*)0)" +defs["igInputScalarN"][1]["defaults"]["p_step_fast"] = "((void*)0)" defs["igInputScalarN"][1]["funcname"] = "InputScalarN" defs["igInputScalarN"][1]["namespace"] = "ImGui" defs["igInputScalarN"][1]["ov_cimguiname"] = "igInputScalarN" @@ -9781,6 +9802,21 @@ defs["igIsItemHovered"][1]["ret"] = "bool" defs["igIsItemHovered"][1]["signature"] = "(ImGuiHoveredFlags)" defs["igIsItemHovered"][1]["stname"] = "" defs["igIsItemHovered"]["(ImGuiHoveredFlags)"] = defs["igIsItemHovered"][1] +defs["igIsItemToggledOpen"] = {} +defs["igIsItemToggledOpen"][1] = {} +defs["igIsItemToggledOpen"][1]["args"] = "()" +defs["igIsItemToggledOpen"][1]["argsT"] = {} +defs["igIsItemToggledOpen"][1]["argsoriginal"] = "()" +defs["igIsItemToggledOpen"][1]["call_args"] = "()" +defs["igIsItemToggledOpen"][1]["cimguiname"] = "igIsItemToggledOpen" +defs["igIsItemToggledOpen"][1]["defaults"] = {} +defs["igIsItemToggledOpen"][1]["funcname"] = "IsItemToggledOpen" +defs["igIsItemToggledOpen"][1]["namespace"] = "ImGui" +defs["igIsItemToggledOpen"][1]["ov_cimguiname"] = "igIsItemToggledOpen" +defs["igIsItemToggledOpen"][1]["ret"] = "bool" +defs["igIsItemToggledOpen"][1]["signature"] = "()" +defs["igIsItemToggledOpen"][1]["stname"] = "" +defs["igIsItemToggledOpen"]["()"] = defs["igIsItemToggledOpen"][1] defs["igIsItemVisible"] = {} defs["igIsItemVisible"][1] = {} defs["igIsItemVisible"][1]["args"] = "()" @@ -12764,7 +12800,7 @@ defs["igSliderInt4"][1]["stname"] = "" defs["igSliderInt4"]["(const char*,int[4],int,int,const char*)"] = defs["igSliderInt4"][1] defs["igSliderScalar"] = {} defs["igSliderScalar"][1] = {} -defs["igSliderScalar"][1]["args"] = "(const char* label,ImGuiDataType data_type,void* v,const void* v_min,const void* v_max,const char* format,float power)" +defs["igSliderScalar"][1]["args"] = "(const char* label,ImGuiDataType data_type,void* p_data,const void* p_min,const void* p_max,const char* format,float power)" defs["igSliderScalar"][1]["argsT"] = {} defs["igSliderScalar"][1]["argsT"][1] = {} defs["igSliderScalar"][1]["argsT"][1]["name"] = "label" @@ -12773,13 +12809,13 @@ defs["igSliderScalar"][1]["argsT"][2] = {} defs["igSliderScalar"][1]["argsT"][2]["name"] = "data_type" defs["igSliderScalar"][1]["argsT"][2]["type"] = "ImGuiDataType" defs["igSliderScalar"][1]["argsT"][3] = {} -defs["igSliderScalar"][1]["argsT"][3]["name"] = "v" +defs["igSliderScalar"][1]["argsT"][3]["name"] = "p_data" defs["igSliderScalar"][1]["argsT"][3]["type"] = "void*" defs["igSliderScalar"][1]["argsT"][4] = {} -defs["igSliderScalar"][1]["argsT"][4]["name"] = "v_min" +defs["igSliderScalar"][1]["argsT"][4]["name"] = "p_min" defs["igSliderScalar"][1]["argsT"][4]["type"] = "const void*" defs["igSliderScalar"][1]["argsT"][5] = {} -defs["igSliderScalar"][1]["argsT"][5]["name"] = "v_max" +defs["igSliderScalar"][1]["argsT"][5]["name"] = "p_max" defs["igSliderScalar"][1]["argsT"][5]["type"] = "const void*" defs["igSliderScalar"][1]["argsT"][6] = {} defs["igSliderScalar"][1]["argsT"][6]["name"] = "format" @@ -12787,8 +12823,8 @@ defs["igSliderScalar"][1]["argsT"][6]["type"] = "const char*" defs["igSliderScalar"][1]["argsT"][7] = {} defs["igSliderScalar"][1]["argsT"][7]["name"] = "power" defs["igSliderScalar"][1]["argsT"][7]["type"] = "float" -defs["igSliderScalar"][1]["argsoriginal"] = "(const char* label,ImGuiDataType data_type,void* v,const void* v_min,const void* v_max,const char* format=((void*)0),float power=1.0f)" -defs["igSliderScalar"][1]["call_args"] = "(label,data_type,v,v_min,v_max,format,power)" +defs["igSliderScalar"][1]["argsoriginal"] = "(const char* label,ImGuiDataType data_type,void* p_data,const void* p_min,const void* p_max,const char* format=((void*)0),float power=1.0f)" +defs["igSliderScalar"][1]["call_args"] = "(label,data_type,p_data,p_min,p_max,format,power)" defs["igSliderScalar"][1]["cimguiname"] = "igSliderScalar" defs["igSliderScalar"][1]["defaults"] = {} defs["igSliderScalar"][1]["defaults"]["format"] = "((void*)0)" @@ -12802,7 +12838,7 @@ defs["igSliderScalar"][1]["stname"] = "" defs["igSliderScalar"]["(const char*,ImGuiDataType,void*,const void*,const void*,const char*,float)"] = defs["igSliderScalar"][1] defs["igSliderScalarN"] = {} defs["igSliderScalarN"][1] = {} -defs["igSliderScalarN"][1]["args"] = "(const char* label,ImGuiDataType data_type,void* v,int components,const void* v_min,const void* v_max,const char* format,float power)" +defs["igSliderScalarN"][1]["args"] = "(const char* label,ImGuiDataType data_type,void* p_data,int components,const void* p_min,const void* p_max,const char* format,float power)" defs["igSliderScalarN"][1]["argsT"] = {} defs["igSliderScalarN"][1]["argsT"][1] = {} defs["igSliderScalarN"][1]["argsT"][1]["name"] = "label" @@ -12811,16 +12847,16 @@ defs["igSliderScalarN"][1]["argsT"][2] = {} defs["igSliderScalarN"][1]["argsT"][2]["name"] = "data_type" defs["igSliderScalarN"][1]["argsT"][2]["type"] = "ImGuiDataType" defs["igSliderScalarN"][1]["argsT"][3] = {} -defs["igSliderScalarN"][1]["argsT"][3]["name"] = "v" +defs["igSliderScalarN"][1]["argsT"][3]["name"] = "p_data" defs["igSliderScalarN"][1]["argsT"][3]["type"] = "void*" defs["igSliderScalarN"][1]["argsT"][4] = {} defs["igSliderScalarN"][1]["argsT"][4]["name"] = "components" defs["igSliderScalarN"][1]["argsT"][4]["type"] = "int" defs["igSliderScalarN"][1]["argsT"][5] = {} -defs["igSliderScalarN"][1]["argsT"][5]["name"] = "v_min" +defs["igSliderScalarN"][1]["argsT"][5]["name"] = "p_min" defs["igSliderScalarN"][1]["argsT"][5]["type"] = "const void*" defs["igSliderScalarN"][1]["argsT"][6] = {} -defs["igSliderScalarN"][1]["argsT"][6]["name"] = "v_max" +defs["igSliderScalarN"][1]["argsT"][6]["name"] = "p_max" defs["igSliderScalarN"][1]["argsT"][6]["type"] = "const void*" defs["igSliderScalarN"][1]["argsT"][7] = {} defs["igSliderScalarN"][1]["argsT"][7]["name"] = "format" @@ -12828,8 +12864,8 @@ defs["igSliderScalarN"][1]["argsT"][7]["type"] = "const char*" defs["igSliderScalarN"][1]["argsT"][8] = {} defs["igSliderScalarN"][1]["argsT"][8]["name"] = "power" defs["igSliderScalarN"][1]["argsT"][8]["type"] = "float" -defs["igSliderScalarN"][1]["argsoriginal"] = "(const char* label,ImGuiDataType data_type,void* v,int components,const void* v_min,const void* v_max,const char* format=((void*)0),float power=1.0f)" -defs["igSliderScalarN"][1]["call_args"] = "(label,data_type,v,components,v_min,v_max,format,power)" +defs["igSliderScalarN"][1]["argsoriginal"] = "(const char* label,ImGuiDataType data_type,void* p_data,int components,const void* p_min,const void* p_max,const char* format=((void*)0),float power=1.0f)" +defs["igSliderScalarN"][1]["call_args"] = "(label,data_type,p_data,components,p_min,p_max,format,power)" defs["igSliderScalarN"][1]["cimguiname"] = "igSliderScalarN" defs["igSliderScalarN"][1]["defaults"] = {} defs["igSliderScalarN"][1]["defaults"]["format"] = "((void*)0)" @@ -13517,7 +13553,7 @@ defs["igVSliderInt"][1]["stname"] = "" defs["igVSliderInt"]["(const char*,const ImVec2,int*,int,int,const char*)"] = defs["igVSliderInt"][1] defs["igVSliderScalar"] = {} defs["igVSliderScalar"][1] = {} -defs["igVSliderScalar"][1]["args"] = "(const char* label,const ImVec2 size,ImGuiDataType data_type,void* v,const void* v_min,const void* v_max,const char* format,float power)" +defs["igVSliderScalar"][1]["args"] = "(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)" defs["igVSliderScalar"][1]["argsT"] = {} defs["igVSliderScalar"][1]["argsT"][1] = {} defs["igVSliderScalar"][1]["argsT"][1]["name"] = "label" @@ -13529,13 +13565,13 @@ defs["igVSliderScalar"][1]["argsT"][3] = {} defs["igVSliderScalar"][1]["argsT"][3]["name"] = "data_type" defs["igVSliderScalar"][1]["argsT"][3]["type"] = "ImGuiDataType" defs["igVSliderScalar"][1]["argsT"][4] = {} -defs["igVSliderScalar"][1]["argsT"][4]["name"] = "v" +defs["igVSliderScalar"][1]["argsT"][4]["name"] = "p_data" defs["igVSliderScalar"][1]["argsT"][4]["type"] = "void*" defs["igVSliderScalar"][1]["argsT"][5] = {} -defs["igVSliderScalar"][1]["argsT"][5]["name"] = "v_min" +defs["igVSliderScalar"][1]["argsT"][5]["name"] = "p_min" defs["igVSliderScalar"][1]["argsT"][5]["type"] = "const void*" defs["igVSliderScalar"][1]["argsT"][6] = {} -defs["igVSliderScalar"][1]["argsT"][6]["name"] = "v_max" +defs["igVSliderScalar"][1]["argsT"][6]["name"] = "p_max" defs["igVSliderScalar"][1]["argsT"][6]["type"] = "const void*" defs["igVSliderScalar"][1]["argsT"][7] = {} defs["igVSliderScalar"][1]["argsT"][7]["name"] = "format" @@ -13543,8 +13579,8 @@ defs["igVSliderScalar"][1]["argsT"][7]["type"] = "const char*" defs["igVSliderScalar"][1]["argsT"][8] = {} defs["igVSliderScalar"][1]["argsT"][8]["name"] = "power" defs["igVSliderScalar"][1]["argsT"][8]["type"] = "float" -defs["igVSliderScalar"][1]["argsoriginal"] = "(const char* label,const ImVec2& size,ImGuiDataType data_type,void* v,const void* v_min,const void* v_max,const char* format=((void*)0),float power=1.0f)" -defs["igVSliderScalar"][1]["call_args"] = "(label,size,data_type,v,v_min,v_max,format,power)" +defs["igVSliderScalar"][1]["argsoriginal"] = "(const char* label,const ImVec2& size,ImGuiDataType data_type,void* p_data,const void* p_min,const void* p_max,const char* format=((void*)0),float power=1.0f)" +defs["igVSliderScalar"][1]["call_args"] = "(label,size,data_type,p_data,p_min,p_max,format,power)" defs["igVSliderScalar"][1]["cimguiname"] = "igVSliderScalar" defs["igVSliderScalar"][1]["defaults"] = {} defs["igVSliderScalar"][1]["defaults"]["format"] = "((void*)0)" diff --git a/generator/output/overloads.txt b/generator/output/overloads.txt index 820ac22..7ae6dc7 100644 --- a/generator/output/overloads.txt +++ b/generator/output/overloads.txt @@ -67,6 +67,9 @@ igSetWindowFocus 2 ImVector_end 2 1 T* ImVector_end () 2 const T* ImVector_end_const ()const +igSetWindowSize 2 +1 void igSetWindowSizeVec2 (const ImVec2,ImGuiCond) +2 void igSetWindowSizeStr (const char*,const ImVec2,ImGuiCond) ImVector_ImVector 2 1 nil ImVector_ImVector () 2 nil ImVector_ImVectorVector (const ImVector) @@ -76,9 +79,9 @@ igSetWindowCollapsed 2 igPlotLines 2 1 void igPlotLines (const char*,const float*,int,int,const char*,float,float,ImVec2,int) 2 void igPlotLinesFnPtr (const char*,float(*)(void*,int),void*,int,int,const char*,float,float,ImVec2) -igListBoxHeader 2 -1 bool igListBoxHeaderVec2 (const char*,const ImVec2) -2 bool igListBoxHeaderInt (const char*,int,int) +igPushStyleColor 2 +1 void igPushStyleColorU32 (ImGuiCol,ImU32) +2 void igPushStyleColor (ImGuiCol,const ImVec4) igTreeNodeExV 2 1 bool igTreeNodeExVStr (const char*,ImGuiTreeNodeFlags,const char*,va_list) 2 bool igTreeNodeExVPtr (const void*,ImGuiTreeNodeFlags,const char*,va_list) @@ -104,15 +107,15 @@ ImColor_ImColor 5 3 nil ImColor_ImColorU32 (ImU32) 4 nil ImColor_ImColorFloat (float,float,float,float) 5 nil ImColor_ImColorVec4 (const ImVec4) -ImVector_front 2 -1 T* ImVector_front () -2 const T* ImVector_front_const ()const ImVector_begin 2 1 T* ImVector_begin () 2 const T* ImVector_begin_const ()const -igPushStyleColor 2 -1 void igPushStyleColorU32 (ImGuiCol,ImU32) -2 void igPushStyleColor (ImGuiCol,const ImVec4) +ImVector_front 2 +1 T* ImVector_front () +2 const T* ImVector_front_const ()const +ImVector_find 2 +1 T* ImVector_find (const T) +2 const T* ImVector_find_const (const T)const igTreeNodeEx 3 1 bool igTreeNodeExStr (const char*,ImGuiTreeNodeFlags) 2 bool igTreeNodeExStrStr (const char*,ImGuiTreeNodeFlags,const char*,...) @@ -120,15 +123,12 @@ igTreeNodeEx 3 igSelectable 2 1 bool igSelectable (const char*,bool,ImGuiSelectableFlags,const ImVec2) 2 bool igSelectableBoolPtr (const char*,bool*,ImGuiSelectableFlags,const ImVec2) -ImVector_find 2 -1 T* ImVector_find (const T) -2 const T* ImVector_find_const (const T)const igMenuItem 2 1 bool igMenuItemBool (const char*,const char*,bool,bool) 2 bool igMenuItemBoolPtr (const char*,const char*,bool*,bool) -igSetWindowSize 2 -1 void igSetWindowSizeVec2 (const ImVec2,ImGuiCond) -2 void igSetWindowSizeStr (const char*,const ImVec2,ImGuiCond) +igListBoxHeader 2 +1 bool igListBoxHeaderVec2 (const char*,const ImVec2) +2 bool igListBoxHeaderInt (const char*,int,int) igTreeNodeV 2 1 bool igTreeNodeVStr (const char*,const char*,va_list) 2 bool igTreeNodeVPtr (const void*,const char*,va_list) diff --git a/generator/output/structs_and_enums.json b/generator/output/structs_and_enums.json index 50e8499..42d66a8 100644 --- a/generator/output/structs_and_enums.json +++ b/generator/output/structs_and_enums.json @@ -1217,33 +1217,28 @@ }, { "calc_value": 17, - "name": "ImGuiNavInput_KeyTab_", + "name": "ImGuiNavInput_KeyLeft_", "value": 17 }, { "calc_value": 18, - "name": "ImGuiNavInput_KeyLeft_", + "name": "ImGuiNavInput_KeyRight_", "value": 18 }, { "calc_value": 19, - "name": "ImGuiNavInput_KeyRight_", + "name": "ImGuiNavInput_KeyUp_", "value": 19 }, { "calc_value": 20, - "name": "ImGuiNavInput_KeyUp_", + "name": "ImGuiNavInput_KeyDown_", "value": 20 }, { "calc_value": 21, - "name": "ImGuiNavInput_KeyDown_", - "value": 21 - }, - { - "calc_value": 22, "name": "ImGuiNavInput_COUNT", - "value": 22 + "value": 21 }, { "calc_value": 16, @@ -2387,7 +2382,7 @@ }, { "name": "NavInputs[ImGuiNavInput_COUNT]", - "size": 22, + "size": 21, "type": "float" }, { @@ -2517,12 +2512,12 @@ }, { "name": "NavInputsDownDuration[ImGuiNavInput_COUNT]", - "size": 22, + "size": 21, "type": "float" }, { "name": "NavInputsDownDurationPrev[ImGuiNavInput_COUNT]", - "size": 22, + "size": 21, "type": "float" }, { diff --git a/generator/output/structs_and_enums.lua b/generator/output/structs_and_enums.lua index df95de7..9a57216 100644 --- a/generator/output/structs_and_enums.lua +++ b/generator/output/structs_and_enums.lua @@ -964,32 +964,28 @@ defs["enums"]["ImGuiNavInput_"][17]["name"] = "ImGuiNavInput_KeyMenu_" defs["enums"]["ImGuiNavInput_"][17]["value"] = 16 defs["enums"]["ImGuiNavInput_"][18] = {} defs["enums"]["ImGuiNavInput_"][18]["calc_value"] = 17 -defs["enums"]["ImGuiNavInput_"][18]["name"] = "ImGuiNavInput_KeyTab_" +defs["enums"]["ImGuiNavInput_"][18]["name"] = "ImGuiNavInput_KeyLeft_" defs["enums"]["ImGuiNavInput_"][18]["value"] = 17 defs["enums"]["ImGuiNavInput_"][19] = {} defs["enums"]["ImGuiNavInput_"][19]["calc_value"] = 18 -defs["enums"]["ImGuiNavInput_"][19]["name"] = "ImGuiNavInput_KeyLeft_" +defs["enums"]["ImGuiNavInput_"][19]["name"] = "ImGuiNavInput_KeyRight_" defs["enums"]["ImGuiNavInput_"][19]["value"] = 18 defs["enums"]["ImGuiNavInput_"][20] = {} defs["enums"]["ImGuiNavInput_"][20]["calc_value"] = 19 -defs["enums"]["ImGuiNavInput_"][20]["name"] = "ImGuiNavInput_KeyRight_" +defs["enums"]["ImGuiNavInput_"][20]["name"] = "ImGuiNavInput_KeyUp_" defs["enums"]["ImGuiNavInput_"][20]["value"] = 19 defs["enums"]["ImGuiNavInput_"][21] = {} defs["enums"]["ImGuiNavInput_"][21]["calc_value"] = 20 -defs["enums"]["ImGuiNavInput_"][21]["name"] = "ImGuiNavInput_KeyUp_" +defs["enums"]["ImGuiNavInput_"][21]["name"] = "ImGuiNavInput_KeyDown_" defs["enums"]["ImGuiNavInput_"][21]["value"] = 20 defs["enums"]["ImGuiNavInput_"][22] = {} defs["enums"]["ImGuiNavInput_"][22]["calc_value"] = 21 -defs["enums"]["ImGuiNavInput_"][22]["name"] = "ImGuiNavInput_KeyDown_" +defs["enums"]["ImGuiNavInput_"][22]["name"] = "ImGuiNavInput_COUNT" defs["enums"]["ImGuiNavInput_"][22]["value"] = 21 defs["enums"]["ImGuiNavInput_"][23] = {} -defs["enums"]["ImGuiNavInput_"][23]["calc_value"] = 22 -defs["enums"]["ImGuiNavInput_"][23]["name"] = "ImGuiNavInput_COUNT" -defs["enums"]["ImGuiNavInput_"][23]["value"] = 22 -defs["enums"]["ImGuiNavInput_"][24] = {} -defs["enums"]["ImGuiNavInput_"][24]["calc_value"] = 16 -defs["enums"]["ImGuiNavInput_"][24]["name"] = "ImGuiNavInput_InternalStart_" -defs["enums"]["ImGuiNavInput_"][24]["value"] = "ImGuiNavInput_KeyMenu_" +defs["enums"]["ImGuiNavInput_"][23]["calc_value"] = 16 +defs["enums"]["ImGuiNavInput_"][23]["name"] = "ImGuiNavInput_InternalStart_" +defs["enums"]["ImGuiNavInput_"][23]["value"] = "ImGuiNavInput_KeyMenu_" defs["enums"]["ImGuiSelectableFlags_"] = {} defs["enums"]["ImGuiSelectableFlags_"][1] = {} defs["enums"]["ImGuiSelectableFlags_"][1]["calc_value"] = 0 @@ -1861,7 +1857,7 @@ defs["structs"]["ImGuiIO"][45]["size"] = 512 defs["structs"]["ImGuiIO"][45]["type"] = "bool" defs["structs"]["ImGuiIO"][46] = {} defs["structs"]["ImGuiIO"][46]["name"] = "NavInputs[ImGuiNavInput_COUNT]" -defs["structs"]["ImGuiIO"][46]["size"] = 22 +defs["structs"]["ImGuiIO"][46]["size"] = 21 defs["structs"]["ImGuiIO"][46]["type"] = "float" defs["structs"]["ImGuiIO"][47] = {} defs["structs"]["ImGuiIO"][47]["name"] = "WantCaptureMouse" @@ -1962,11 +1958,11 @@ defs["structs"]["ImGuiIO"][74]["size"] = 512 defs["structs"]["ImGuiIO"][74]["type"] = "float" defs["structs"]["ImGuiIO"][75] = {} defs["structs"]["ImGuiIO"][75]["name"] = "NavInputsDownDuration[ImGuiNavInput_COUNT]" -defs["structs"]["ImGuiIO"][75]["size"] = 22 +defs["structs"]["ImGuiIO"][75]["size"] = 21 defs["structs"]["ImGuiIO"][75]["type"] = "float" defs["structs"]["ImGuiIO"][76] = {} defs["structs"]["ImGuiIO"][76]["name"] = "NavInputsDownDurationPrev[ImGuiNavInput_COUNT]" -defs["structs"]["ImGuiIO"][76]["size"] = 22 +defs["structs"]["ImGuiIO"][76]["size"] = 21 defs["structs"]["ImGuiIO"][76]["type"] = "float" defs["structs"]["ImGuiIO"][77] = {} defs["structs"]["ImGuiIO"][77]["name"] = "InputQueueCharacters" diff --git a/imgui b/imgui index f0f5301..bdce833 160000 --- a/imgui +++ b/imgui @@ -1 +1 @@ -Subproject commit f0f5301612dbaa2caeede3091df6aee1c872dbdf +Subproject commit bdce8336364595d1a446957a6164c97363349a53