pull imgui 1.75 and generate

This commit is contained in:
Victor Bombi
2020-02-10 16:28:40 +01:00
parent 6740445cbc
commit 4e00f55cc8
13 changed files with 619 additions and 321 deletions

View File

@@ -1,5 +1,5 @@
//This file is automatically generated by generator.lua from https://github.com/cimgui/cimgui
//based on imgui.h file version "1.74" from Dear ImGui https://github.com/ocornut/imgui
//based on imgui.h file version "1.75" from Dear ImGui https://github.com/ocornut/imgui
#include "./imgui/imgui.h"
#include "./imgui/imgui_internal.h"
@@ -1048,15 +1048,15 @@ CIMGUI_API bool igBeginPopup(const char* str_id,ImGuiWindowFlags flags)
{
return ImGui::BeginPopup(str_id,flags);
}
CIMGUI_API bool igBeginPopupContextItem(const char* str_id,int mouse_button)
CIMGUI_API bool igBeginPopupContextItem(const char* str_id,ImGuiMouseButton mouse_button)
{
return ImGui::BeginPopupContextItem(str_id,mouse_button);
}
CIMGUI_API bool igBeginPopupContextWindow(const char* str_id,int mouse_button,bool also_over_items)
CIMGUI_API bool igBeginPopupContextWindow(const char* str_id,ImGuiMouseButton mouse_button,bool also_over_items)
{
return ImGui::BeginPopupContextWindow(str_id,mouse_button,also_over_items);
}
CIMGUI_API bool igBeginPopupContextVoid(const char* str_id,int mouse_button)
CIMGUI_API bool igBeginPopupContextVoid(const char* str_id,ImGuiMouseButton mouse_button)
{
return ImGui::BeginPopupContextVoid(str_id,mouse_button);
}
@@ -1068,7 +1068,7 @@ CIMGUI_API void igEndPopup()
{
return ImGui::EndPopup();
}
CIMGUI_API bool igOpenPopupOnItemClick(const char* str_id,int mouse_button)
CIMGUI_API bool igOpenPopupOnItemClick(const char* str_id,ImGuiMouseButton mouse_button)
{
return ImGui::OpenPopupOnItemClick(str_id,mouse_button);
}
@@ -1208,7 +1208,7 @@ CIMGUI_API bool igIsItemFocused()
{
return ImGui::IsItemFocused();
}
CIMGUI_API bool igIsItemClicked(int mouse_button)
CIMGUI_API bool igIsItemClicked(ImGuiMouseButton mouse_button)
{
return ImGui::IsItemClicked(mouse_button);
}
@@ -1348,29 +1348,25 @@ CIMGUI_API int igGetKeyPressedAmount(int key_index,float repeat_delay,float rate
{
return ImGui::GetKeyPressedAmount(key_index,repeat_delay,rate);
}
CIMGUI_API bool igIsMouseDown(int button)
CIMGUI_API void igCaptureKeyboardFromApp(bool want_capture_keyboard_value)
{
return ImGui::CaptureKeyboardFromApp(want_capture_keyboard_value);
}
CIMGUI_API bool igIsMouseDown(ImGuiMouseButton button)
{
return ImGui::IsMouseDown(button);
}
CIMGUI_API bool igIsAnyMouseDown()
{
return ImGui::IsAnyMouseDown();
}
CIMGUI_API bool igIsMouseClicked(int button,bool repeat)
CIMGUI_API bool igIsMouseClicked(ImGuiMouseButton button,bool repeat)
{
return ImGui::IsMouseClicked(button,repeat);
}
CIMGUI_API bool igIsMouseDoubleClicked(int button)
{
return ImGui::IsMouseDoubleClicked(button);
}
CIMGUI_API bool igIsMouseReleased(int button)
CIMGUI_API bool igIsMouseReleased(ImGuiMouseButton button)
{
return ImGui::IsMouseReleased(button);
}
CIMGUI_API bool igIsMouseDragging(int button,float lock_threshold)
CIMGUI_API bool igIsMouseDoubleClicked(ImGuiMouseButton button)
{
return ImGui::IsMouseDragging(button,lock_threshold);
return ImGui::IsMouseDoubleClicked(button);
}
CIMGUI_API bool igIsMouseHoveringRect(const ImVec2 r_min,const ImVec2 r_max,bool clip)
{
@@ -1380,6 +1376,10 @@ CIMGUI_API bool igIsMousePosValid(const ImVec2* mouse_pos)
{
return ImGui::IsMousePosValid(mouse_pos);
}
CIMGUI_API bool igIsAnyMouseDown()
{
return ImGui::IsAnyMouseDown();
}
CIMGUI_API ImVec2 igGetMousePos()
{
return ImGui::GetMousePos();
@@ -1388,11 +1388,15 @@ CIMGUI_API ImVec2 igGetMousePosOnOpeningCurrentPopup()
{
return ImGui::GetMousePosOnOpeningCurrentPopup();
}
CIMGUI_API ImVec2 igGetMouseDragDelta(int button,float lock_threshold)
CIMGUI_API bool igIsMouseDragging(ImGuiMouseButton button,float lock_threshold)
{
return ImGui::IsMouseDragging(button,lock_threshold);
}
CIMGUI_API ImVec2 igGetMouseDragDelta(ImGuiMouseButton button,float lock_threshold)
{
return ImGui::GetMouseDragDelta(button,lock_threshold);
}
CIMGUI_API void igResetMouseDragDelta(int button)
CIMGUI_API void igResetMouseDragDelta(ImGuiMouseButton button)
{
return ImGui::ResetMouseDragDelta(button);
}
@@ -1400,13 +1404,9 @@ CIMGUI_API ImGuiMouseCursor igGetMouseCursor()
{
return ImGui::GetMouseCursor();
}
CIMGUI_API void igSetMouseCursor(ImGuiMouseCursor type)
CIMGUI_API void igSetMouseCursor(ImGuiMouseCursor cursor_type)
{
return ImGui::SetMouseCursor(type);
}
CIMGUI_API void igCaptureKeyboardFromApp(bool want_capture_keyboard_value)
{
return ImGui::CaptureKeyboardFromApp(want_capture_keyboard_value);
return ImGui::SetMouseCursor(cursor_type);
}
CIMGUI_API void igCaptureMouseFromApp(bool want_capture_mouse_value)
{
@@ -1864,6 +1864,14 @@ CIMGUI_API void ImDrawList_AddCircleFilled(ImDrawList* self,const ImVec2 center,
{
return self->AddCircleFilled(center,radius,col,num_segments);
}
CIMGUI_API void ImDrawList_AddNgon(ImDrawList* self,const ImVec2 center,float radius,ImU32 col,int num_segments,float thickness)
{
return self->AddNgon(center,radius,col,num_segments,thickness);
}
CIMGUI_API void ImDrawList_AddNgonFilled(ImDrawList* self,const ImVec2 center,float radius,ImU32 col,int num_segments)
{
return self->AddNgonFilled(center,radius,col,num_segments);
}
CIMGUI_API void ImDrawList_AddText(ImDrawList* self,const ImVec2 pos,ImU32 col,const char* text_begin,const char* text_end)
{
return self->AddText(pos,col,text_begin,text_end);
@@ -1880,9 +1888,9 @@ CIMGUI_API void ImDrawList_AddConvexPolyFilled(ImDrawList* self,const ImVec2* po
{
return self->AddConvexPolyFilled(points,num_points,col);
}
CIMGUI_API void ImDrawList_AddBezierCurve(ImDrawList* self,const ImVec2 pos0,const ImVec2 cp0,const ImVec2 cp1,const ImVec2 pos1,ImU32 col,float thickness,int num_segments)
CIMGUI_API void ImDrawList_AddBezierCurve(ImDrawList* self,const ImVec2 p1,const ImVec2 p2,const ImVec2 p3,const ImVec2 p4,ImU32 col,float thickness,int num_segments)
{
return self->AddBezierCurve(pos0,cp0,cp1,pos1,col,thickness,num_segments);
return self->AddBezierCurve(p1,p2,p3,p4,col,thickness,num_segments);
}
CIMGUI_API void ImDrawList_AddImage(ImDrawList* self,ImTextureID user_texture_id,const ImVec2 p_min,const ImVec2 p_max,const ImVec2 uv_min,const ImVec2 uv_max,ImU32 col)
{
@@ -1924,9 +1932,9 @@ CIMGUI_API void ImDrawList_PathArcToFast(ImDrawList* self,const ImVec2 center,fl
{
return self->PathArcToFast(center,radius,a_min_of_12,a_max_of_12);
}
CIMGUI_API void ImDrawList_PathBezierCurveTo(ImDrawList* self,const ImVec2 p1,const ImVec2 p2,const ImVec2 p3,int num_segments)
CIMGUI_API void ImDrawList_PathBezierCurveTo(ImDrawList* self,const ImVec2 p2,const ImVec2 p3,const ImVec2 p4,int num_segments)
{
return self->PathBezierCurveTo(p1,p2,p3,num_segments);
return self->PathBezierCurveTo(p2,p3,p4,num_segments);
}
CIMGUI_API void ImDrawList_PathRect(ImDrawList* self,const ImVec2 rect_min,const ImVec2 rect_max,float rounding,ImDrawCornerFlags rounding_corners)
{
@@ -1968,6 +1976,10 @@ CIMGUI_API void ImDrawList_PrimReserve(ImDrawList* self,int idx_count,int vtx_co
{
return self->PrimReserve(idx_count,vtx_count);
}
CIMGUI_API void ImDrawList_PrimUnreserve(ImDrawList* self,int idx_count,int vtx_count)
{
return self->PrimUnreserve(idx_count,vtx_count);
}
CIMGUI_API void ImDrawList_PrimRect(ImDrawList* self,const ImVec2 a,const ImVec2 b,ImU32 col)
{
return self->PrimRect(a,b,col);
@@ -2434,11 +2446,11 @@ CIMGUI_API ImVec2_Simple igGetMousePosOnOpeningCurrentPopup_nonUDT2()
ImVec2_Simple ret2 = ImVec2ToSimple(ret);
return ret2;
}
CIMGUI_API void igGetMouseDragDelta_nonUDT(ImVec2 *pOut,int button,float lock_threshold)
CIMGUI_API void igGetMouseDragDelta_nonUDT(ImVec2 *pOut,ImGuiMouseButton button,float lock_threshold)
{
*pOut = ImGui::GetMouseDragDelta(button,lock_threshold);
}
CIMGUI_API ImVec2_Simple igGetMouseDragDelta_nonUDT2(int button,float lock_threshold)
CIMGUI_API ImVec2_Simple igGetMouseDragDelta_nonUDT2(ImGuiMouseButton button,float lock_threshold)
{
ImVec2 ret = ImGui::GetMouseDragDelta(button,lock_threshold);
ImVec2_Simple ret2 = ImVec2ToSimple(ret);