From 250169feb74593d838e8dbada9960246de1d4747 Mon Sep 17 00:00:00 2001 From: Victor Bombi Date: Sat, 30 May 2020 15:33:12 +0200 Subject: [PATCH] generation after FnPtr change --- cimgui.cpp | 8 ++++---- cimgui.h | 8 ++++---- generator/output/cimgui.cpp | 8 ++++---- generator/output/cimgui.h | 8 ++++---- generator/output/definitions.json | 8 ++++---- generator/output/definitions.lua | 8 ++++---- generator/output/overloads.txt | 8 ++++---- 7 files changed, 28 insertions(+), 28 deletions(-) diff --git a/cimgui.cpp b/cimgui.cpp index abaca4c..9e5aa08 100644 --- a/cimgui.cpp +++ b/cimgui.cpp @@ -654,7 +654,7 @@ CIMGUI_API bool igComboStr(const char* label,int* current_item,const char* items { return ImGui::Combo(label,current_item,items_separated_by_zeros,popup_max_height_in_items); } -CIMGUI_API bool igComboFnPtr(const char* label,int* current_item,bool(*items_getter)(void* data,int idx,const char** out_text),void* data,int items_count,int popup_max_height_in_items) +CIMGUI_API bool igComboFnBoolPtr(const char* label,int* current_item,bool(*items_getter)(void* data,int idx,const char** out_text),void* data,int items_count,int popup_max_height_in_items) { return ImGui::Combo(label,current_item,items_getter,data,items_count,popup_max_height_in_items); } @@ -938,7 +938,7 @@ CIMGUI_API bool igListBoxStr_arr(const char* label,int* current_item,const char* { return ImGui::ListBox(label,current_item,items,items_count,height_in_items); } -CIMGUI_API bool igListBoxFnPtr(const char* label,int* current_item,bool(*items_getter)(void* data,int idx,const char** out_text),void* data,int items_count,int height_in_items) +CIMGUI_API bool igListBoxFnBoolPtr(const char* label,int* current_item,bool(*items_getter)(void* data,int idx,const char** out_text),void* data,int items_count,int height_in_items) { return ImGui::ListBox(label,current_item,items_getter,data,items_count,height_in_items); } @@ -958,7 +958,7 @@ CIMGUI_API void igPlotLinesFloatPtr(const char* label,const float* values,int va { return ImGui::PlotLines(label,values,values_count,values_offset,overlay_text,scale_min,scale_max,graph_size,stride); } -CIMGUI_API void igPlotLinesFnPtr(const char* label,float(*values_getter)(void* data,int idx),void* data,int values_count,int values_offset,const char* overlay_text,float scale_min,float scale_max,ImVec2 graph_size) +CIMGUI_API void igPlotLinesFnFloatPtr(const char* label,float(*values_getter)(void* data,int idx),void* data,int values_count,int values_offset,const char* overlay_text,float scale_min,float scale_max,ImVec2 graph_size) { return ImGui::PlotLines(label,values_getter,data,values_count,values_offset,overlay_text,scale_min,scale_max,graph_size); } @@ -966,7 +966,7 @@ CIMGUI_API void igPlotHistogramFloatPtr(const char* label,const float* values,in { return ImGui::PlotHistogram(label,values,values_count,values_offset,overlay_text,scale_min,scale_max,graph_size,stride); } -CIMGUI_API void igPlotHistogramFnPtr(const char* label,float(*values_getter)(void* data,int idx),void* data,int values_count,int values_offset,const char* overlay_text,float scale_min,float scale_max,ImVec2 graph_size) +CIMGUI_API void igPlotHistogramFnFloatPtr(const char* label,float(*values_getter)(void* data,int idx),void* data,int values_count,int values_offset,const char* overlay_text,float scale_min,float scale_max,ImVec2 graph_size) { return ImGui::PlotHistogram(label,values_getter,data,values_count,values_offset,overlay_text,scale_min,scale_max,graph_size); } diff --git a/cimgui.h b/cimgui.h index 1483493..0ba753f 100644 --- a/cimgui.h +++ b/cimgui.h @@ -1927,7 +1927,7 @@ CIMGUI_API bool igBeginCombo(const char* label,const char* preview_value,ImGuiCo CIMGUI_API void igEndCombo(void); CIMGUI_API bool igComboStr_arr(const char* label,int* current_item,const char* const items[],int items_count,int popup_max_height_in_items); CIMGUI_API bool igComboStr(const char* label,int* current_item,const char* items_separated_by_zeros,int popup_max_height_in_items); -CIMGUI_API bool igComboFnPtr(const char* label,int* current_item,bool(*items_getter)(void* data,int idx,const char** out_text),void* data,int items_count,int popup_max_height_in_items); +CIMGUI_API bool igComboFnBoolPtr(const char* label,int* current_item,bool(*items_getter)(void* data,int idx,const char** out_text),void* data,int items_count,int popup_max_height_in_items); CIMGUI_API bool igDragFloat(const char* label,float* v,float v_speed,float v_min,float v_max,const char* format,float power); CIMGUI_API bool igDragFloat2(const char* label,float v[2],float v_speed,float v_min,float v_max,const char* format,float power); CIMGUI_API bool igDragFloat3(const char* label,float v[3],float v_speed,float v_min,float v_max,const char* format,float power); @@ -1994,14 +1994,14 @@ CIMGUI_API void igSetNextItemOpen(bool is_open,ImGuiCond cond); CIMGUI_API bool igSelectableBool(const char* label,bool selected,ImGuiSelectableFlags flags,const ImVec2 size); CIMGUI_API bool igSelectableBoolPtr(const char* label,bool* p_selected,ImGuiSelectableFlags flags,const ImVec2 size); CIMGUI_API bool igListBoxStr_arr(const char* label,int* current_item,const char* const items[],int items_count,int height_in_items); -CIMGUI_API bool igListBoxFnPtr(const char* label,int* current_item,bool(*items_getter)(void* data,int idx,const char** out_text),void* data,int items_count,int height_in_items); +CIMGUI_API bool igListBoxFnBoolPtr(const char* label,int* current_item,bool(*items_getter)(void* data,int idx,const char** out_text),void* data,int items_count,int height_in_items); CIMGUI_API bool igListBoxHeaderVec2(const char* label,const ImVec2 size); CIMGUI_API bool igListBoxHeaderInt(const char* label,int items_count,int height_in_items); CIMGUI_API void igListBoxFooter(void); CIMGUI_API void igPlotLinesFloatPtr(const char* label,const float* values,int values_count,int values_offset,const char* overlay_text,float scale_min,float scale_max,ImVec2 graph_size,int stride); -CIMGUI_API void igPlotLinesFnPtr(const char* label,float(*values_getter)(void* data,int idx),void* data,int values_count,int values_offset,const char* overlay_text,float scale_min,float scale_max,ImVec2 graph_size); +CIMGUI_API void igPlotLinesFnFloatPtr(const char* label,float(*values_getter)(void* data,int idx),void* data,int values_count,int values_offset,const char* overlay_text,float scale_min,float scale_max,ImVec2 graph_size); CIMGUI_API void igPlotHistogramFloatPtr(const char* label,const float* values,int values_count,int values_offset,const char* overlay_text,float scale_min,float scale_max,ImVec2 graph_size,int stride); -CIMGUI_API void igPlotHistogramFnPtr(const char* label,float(*values_getter)(void* data,int idx),void* data,int values_count,int values_offset,const char* overlay_text,float scale_min,float scale_max,ImVec2 graph_size); +CIMGUI_API void igPlotHistogramFnFloatPtr(const char* label,float(*values_getter)(void* data,int idx),void* data,int values_count,int values_offset,const char* overlay_text,float scale_min,float scale_max,ImVec2 graph_size); 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); diff --git a/generator/output/cimgui.cpp b/generator/output/cimgui.cpp index abaca4c..9e5aa08 100644 --- a/generator/output/cimgui.cpp +++ b/generator/output/cimgui.cpp @@ -654,7 +654,7 @@ CIMGUI_API bool igComboStr(const char* label,int* current_item,const char* items { return ImGui::Combo(label,current_item,items_separated_by_zeros,popup_max_height_in_items); } -CIMGUI_API bool igComboFnPtr(const char* label,int* current_item,bool(*items_getter)(void* data,int idx,const char** out_text),void* data,int items_count,int popup_max_height_in_items) +CIMGUI_API bool igComboFnBoolPtr(const char* label,int* current_item,bool(*items_getter)(void* data,int idx,const char** out_text),void* data,int items_count,int popup_max_height_in_items) { return ImGui::Combo(label,current_item,items_getter,data,items_count,popup_max_height_in_items); } @@ -938,7 +938,7 @@ CIMGUI_API bool igListBoxStr_arr(const char* label,int* current_item,const char* { return ImGui::ListBox(label,current_item,items,items_count,height_in_items); } -CIMGUI_API bool igListBoxFnPtr(const char* label,int* current_item,bool(*items_getter)(void* data,int idx,const char** out_text),void* data,int items_count,int height_in_items) +CIMGUI_API bool igListBoxFnBoolPtr(const char* label,int* current_item,bool(*items_getter)(void* data,int idx,const char** out_text),void* data,int items_count,int height_in_items) { return ImGui::ListBox(label,current_item,items_getter,data,items_count,height_in_items); } @@ -958,7 +958,7 @@ CIMGUI_API void igPlotLinesFloatPtr(const char* label,const float* values,int va { return ImGui::PlotLines(label,values,values_count,values_offset,overlay_text,scale_min,scale_max,graph_size,stride); } -CIMGUI_API void igPlotLinesFnPtr(const char* label,float(*values_getter)(void* data,int idx),void* data,int values_count,int values_offset,const char* overlay_text,float scale_min,float scale_max,ImVec2 graph_size) +CIMGUI_API void igPlotLinesFnFloatPtr(const char* label,float(*values_getter)(void* data,int idx),void* data,int values_count,int values_offset,const char* overlay_text,float scale_min,float scale_max,ImVec2 graph_size) { return ImGui::PlotLines(label,values_getter,data,values_count,values_offset,overlay_text,scale_min,scale_max,graph_size); } @@ -966,7 +966,7 @@ CIMGUI_API void igPlotHistogramFloatPtr(const char* label,const float* values,in { return ImGui::PlotHistogram(label,values,values_count,values_offset,overlay_text,scale_min,scale_max,graph_size,stride); } -CIMGUI_API void igPlotHistogramFnPtr(const char* label,float(*values_getter)(void* data,int idx),void* data,int values_count,int values_offset,const char* overlay_text,float scale_min,float scale_max,ImVec2 graph_size) +CIMGUI_API void igPlotHistogramFnFloatPtr(const char* label,float(*values_getter)(void* data,int idx),void* data,int values_count,int values_offset,const char* overlay_text,float scale_min,float scale_max,ImVec2 graph_size) { return ImGui::PlotHistogram(label,values_getter,data,values_count,values_offset,overlay_text,scale_min,scale_max,graph_size); } diff --git a/generator/output/cimgui.h b/generator/output/cimgui.h index 1483493..0ba753f 100644 --- a/generator/output/cimgui.h +++ b/generator/output/cimgui.h @@ -1927,7 +1927,7 @@ CIMGUI_API bool igBeginCombo(const char* label,const char* preview_value,ImGuiCo CIMGUI_API void igEndCombo(void); CIMGUI_API bool igComboStr_arr(const char* label,int* current_item,const char* const items[],int items_count,int popup_max_height_in_items); CIMGUI_API bool igComboStr(const char* label,int* current_item,const char* items_separated_by_zeros,int popup_max_height_in_items); -CIMGUI_API bool igComboFnPtr(const char* label,int* current_item,bool(*items_getter)(void* data,int idx,const char** out_text),void* data,int items_count,int popup_max_height_in_items); +CIMGUI_API bool igComboFnBoolPtr(const char* label,int* current_item,bool(*items_getter)(void* data,int idx,const char** out_text),void* data,int items_count,int popup_max_height_in_items); CIMGUI_API bool igDragFloat(const char* label,float* v,float v_speed,float v_min,float v_max,const char* format,float power); CIMGUI_API bool igDragFloat2(const char* label,float v[2],float v_speed,float v_min,float v_max,const char* format,float power); CIMGUI_API bool igDragFloat3(const char* label,float v[3],float v_speed,float v_min,float v_max,const char* format,float power); @@ -1994,14 +1994,14 @@ CIMGUI_API void igSetNextItemOpen(bool is_open,ImGuiCond cond); CIMGUI_API bool igSelectableBool(const char* label,bool selected,ImGuiSelectableFlags flags,const ImVec2 size); CIMGUI_API bool igSelectableBoolPtr(const char* label,bool* p_selected,ImGuiSelectableFlags flags,const ImVec2 size); CIMGUI_API bool igListBoxStr_arr(const char* label,int* current_item,const char* const items[],int items_count,int height_in_items); -CIMGUI_API bool igListBoxFnPtr(const char* label,int* current_item,bool(*items_getter)(void* data,int idx,const char** out_text),void* data,int items_count,int height_in_items); +CIMGUI_API bool igListBoxFnBoolPtr(const char* label,int* current_item,bool(*items_getter)(void* data,int idx,const char** out_text),void* data,int items_count,int height_in_items); CIMGUI_API bool igListBoxHeaderVec2(const char* label,const ImVec2 size); CIMGUI_API bool igListBoxHeaderInt(const char* label,int items_count,int height_in_items); CIMGUI_API void igListBoxFooter(void); CIMGUI_API void igPlotLinesFloatPtr(const char* label,const float* values,int values_count,int values_offset,const char* overlay_text,float scale_min,float scale_max,ImVec2 graph_size,int stride); -CIMGUI_API void igPlotLinesFnPtr(const char* label,float(*values_getter)(void* data,int idx),void* data,int values_count,int values_offset,const char* overlay_text,float scale_min,float scale_max,ImVec2 graph_size); +CIMGUI_API void igPlotLinesFnFloatPtr(const char* label,float(*values_getter)(void* data,int idx),void* data,int values_count,int values_offset,const char* overlay_text,float scale_min,float scale_max,ImVec2 graph_size); CIMGUI_API void igPlotHistogramFloatPtr(const char* label,const float* values,int values_count,int values_offset,const char* overlay_text,float scale_min,float scale_max,ImVec2 graph_size,int stride); -CIMGUI_API void igPlotHistogramFnPtr(const char* label,float(*values_getter)(void* data,int idx),void* data,int values_count,int values_offset,const char* overlay_text,float scale_min,float scale_max,ImVec2 graph_size); +CIMGUI_API void igPlotHistogramFnFloatPtr(const char* label,float(*values_getter)(void* data,int idx),void* data,int values_count,int values_offset,const char* overlay_text,float scale_min,float scale_max,ImVec2 graph_size); 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); diff --git a/generator/output/definitions.json b/generator/output/definitions.json index bcc51d1..a39e415 100644 --- a/generator/output/definitions.json +++ b/generator/output/definitions.json @@ -11595,7 +11595,7 @@ }, "funcname": "Combo", "namespace": "ImGui", - "ov_cimguiname": "igComboFnPtr", + "ov_cimguiname": "igComboFnBoolPtr", "ret": "bool", "signature": "(const char*,int*,bool(*)(void*,int,const char**),void*,int,int)", "stname": "" @@ -18876,7 +18876,7 @@ }, "funcname": "ListBox", "namespace": "ImGui", - "ov_cimguiname": "igListBoxFnPtr", + "ov_cimguiname": "igListBoxFnBoolPtr", "ret": "bool", "signature": "(const char*,int*,bool(*)(void*,int,const char**),void*,int,int)", "stname": "" @@ -19787,7 +19787,7 @@ }, "funcname": "PlotHistogram", "namespace": "ImGui", - "ov_cimguiname": "igPlotHistogramFnPtr", + "ov_cimguiname": "igPlotHistogramFnFloatPtr", "ret": "void", "signature": "(const char*,float(*)(void*,int),void*,int,int,const char*,float,float,ImVec2)", "stname": "" @@ -19906,7 +19906,7 @@ }, "funcname": "PlotLines", "namespace": "ImGui", - "ov_cimguiname": "igPlotLinesFnPtr", + "ov_cimguiname": "igPlotLinesFnFloatPtr", "ret": "void", "signature": "(const char*,float(*)(void*,int),void*,int,int,const char*,float,float,ImVec2)", "stname": "" diff --git a/generator/output/definitions.lua b/generator/output/definitions.lua index d6f0321..b0c92b5 100644 --- a/generator/output/definitions.lua +++ b/generator/output/definitions.lua @@ -9684,7 +9684,7 @@ defs["igCombo"][3]["defaults"] = {} defs["igCombo"][3]["defaults"]["popup_max_height_in_items"] = "-1" defs["igCombo"][3]["funcname"] = "Combo" defs["igCombo"][3]["namespace"] = "ImGui" -defs["igCombo"][3]["ov_cimguiname"] = "igComboFnPtr" +defs["igCombo"][3]["ov_cimguiname"] = "igComboFnBoolPtr" defs["igCombo"][3]["ret"] = "bool" defs["igCombo"][3]["signature"] = "(const char*,int*,bool(*)(void*,int,const char**),void*,int,int)" defs["igCombo"][3]["stname"] = "" @@ -15840,7 +15840,7 @@ defs["igListBox"][2]["defaults"] = {} defs["igListBox"][2]["defaults"]["height_in_items"] = "-1" defs["igListBox"][2]["funcname"] = "ListBox" defs["igListBox"][2]["namespace"] = "ImGui" -defs["igListBox"][2]["ov_cimguiname"] = "igListBoxFnPtr" +defs["igListBox"][2]["ov_cimguiname"] = "igListBoxFnBoolPtr" defs["igListBox"][2]["ret"] = "bool" defs["igListBox"][2]["signature"] = "(const char*,int*,bool(*)(void*,int,const char**),void*,int,int)" defs["igListBox"][2]["stname"] = "" @@ -16609,7 +16609,7 @@ defs["igPlotHistogram"][2]["defaults"]["scale_min"] = "FLT_MAX" defs["igPlotHistogram"][2]["defaults"]["values_offset"] = "0" defs["igPlotHistogram"][2]["funcname"] = "PlotHistogram" defs["igPlotHistogram"][2]["namespace"] = "ImGui" -defs["igPlotHistogram"][2]["ov_cimguiname"] = "igPlotHistogramFnPtr" +defs["igPlotHistogram"][2]["ov_cimguiname"] = "igPlotHistogramFnFloatPtr" defs["igPlotHistogram"][2]["ret"] = "void" defs["igPlotHistogram"][2]["signature"] = "(const char*,float(*)(void*,int),void*,int,int,const char*,float,float,ImVec2)" defs["igPlotHistogram"][2]["stname"] = "" @@ -16705,7 +16705,7 @@ defs["igPlotLines"][2]["defaults"]["scale_min"] = "FLT_MAX" defs["igPlotLines"][2]["defaults"]["values_offset"] = "0" defs["igPlotLines"][2]["funcname"] = "PlotLines" defs["igPlotLines"][2]["namespace"] = "ImGui" -defs["igPlotLines"][2]["ov_cimguiname"] = "igPlotLinesFnPtr" +defs["igPlotLines"][2]["ov_cimguiname"] = "igPlotLinesFnFloatPtr" defs["igPlotLines"][2]["ret"] = "void" defs["igPlotLines"][2]["signature"] = "(const char*,float(*)(void*,int),void*,int,int,const char*,float,float,ImVec2)" defs["igPlotLines"][2]["stname"] = "" diff --git a/generator/output/overloads.txt b/generator/output/overloads.txt index 30f1753..eeeee3c 100644 --- a/generator/output/overloads.txt +++ b/generator/output/overloads.txt @@ -30,7 +30,7 @@ ImVector_back 2 2 const T* ImVector_back_const ()const igPlotHistogram 2 1 void igPlotHistogramFloatPtr (const char*,const float*,int,int,const char*,float,float,ImVec2,int) -2 void igPlotHistogramFnPtr (const char*,float(*)(void*,int),void*,int,int,const char*,float,float,ImVec2) +2 void igPlotHistogramFnFloatPtr (const char*,float(*)(void*,int),void*,int,int,const char*,float,float,ImVec2) igGetID 3 1 ImGuiID igGetIDStr (const char*) 2 ImGuiID igGetIDStrStr (const char*,const char*) @@ -89,7 +89,7 @@ igItemSize 2 igCombo 3 1 bool igComboStr_arr (const char*,int*,const char* const[],int,int) 2 bool igComboStr (const char*,int*,const char*,int) -3 bool igComboFnPtr (const char*,int*,bool(*)(void*,int,const char**),void*,int,int) +3 bool igComboFnBoolPtr (const char*,int*,bool(*)(void*,int,const char**),void*,int,int) igSetScrollY 2 1 void igSetScrollYFloat (float) 2 void igSetScrollYWindowPtr (ImGuiWindow*,float) @@ -131,7 +131,7 @@ igSetWindowCollapsed 3 3 void igSetWindowCollapsedWindowPtr (ImGuiWindow*,bool,ImGuiCond) igPlotLines 2 1 void igPlotLinesFloatPtr (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) +2 void igPlotLinesFnFloatPtr (const char*,float(*)(void*,int),void*,int,int,const char*,float,float,ImVec2) igPushStyleColor 2 1 void igPushStyleColorU32 (ImGuiCol,ImU32) 2 void igPushStyleColorVec4 (ImGuiCol,const ImVec4) @@ -162,7 +162,7 @@ ImPool_Remove 2 2 void ImPool_RemovePoolIdx (ImGuiID,ImPoolIdx) igListBox 2 1 bool igListBoxStr_arr (const char*,int*,const char* const[],int,int) -2 bool igListBoxFnPtr (const char*,int*,bool(*)(void*,int,const char**),void*,int,int) +2 bool igListBoxFnBoolPtr (const char*,int*,bool(*)(void*,int,const char**),void*,int,int) ImGuiPtrOrIndex_ImGuiPtrOrIndex 2 1 nil ImGuiPtrOrIndex_ImGuiPtrOrIndexPtr (void*) 2 nil ImGuiPtrOrIndex_ImGuiPtrOrIndexInt (int)