kennethnym/cimgui
1
0
Fork 0
mirror of https://github.com/cimgui/cimgui.git synced 2025-08-13 13:18:31 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update to v1.66.

Browse Source
This commit is contained in:
Eric Mellino
2018-11-22 11:06:40 -08:00
parent 8911a5a992
commit ed6212bb34
10 changed files with 322 additions and 272 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
generator/output/cimgui.cpp
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.65" from Dear ImGui https://github.com/ocornut/imgui
//based on imgui.h file version "1.66" from Dear ImGui https://github.com/ocornut/imgui
#include "./imgui/imgui.h"
#include "cimgui.h"
@@ -281,9 +281,9 @@ CIMGUI_API void igSetScrollY(float scroll_y)
{
return ImGui::SetScrollY(scroll_y);
}
CIMGUI_API void igSetScrollHere(float center_y_ratio)
CIMGUI_API void igSetScrollHereY(float center_y_ratio)
{
return ImGui::SetScrollHere(center_y_ratio);
return ImGui::SetScrollHereY(center_y_ratio);
}
CIMGUI_API void igSetScrollFromPosY(float pos_y,float center_y_ratio)
{
@@ -711,9 +711,9 @@ CIMGUI_API bool igSliderFloat4(const char* label,float v[4],float v_min,float v_
{
return ImGui::SliderFloat4(label,v,v_min,v_max,format,power);
}
CIMGUI_API bool igSliderAngle(const char* label,float* v_rad,float v_degrees_min,float v_degrees_max)
CIMGUI_API bool igSliderAngle(const char* label,float* v_rad,float v_degrees_min,float v_degrees_max,const char* format)
{
return ImGui::SliderAngle(label,v_rad,v_degrees_min,v_degrees_max);
return ImGui::SliderAngle(label,v_rad,v_degrees_min,v_degrees_max,format);
}
CIMGUI_API bool igSliderInt(const char* label,int* v,int v_min,int v_max,const char* format)
{
@@ -1142,6 +1142,10 @@ CIMGUI_API void igEndDragDropTarget()
{
return ImGui::EndDragDropTarget();
}
CIMGUI_API const ImGuiPayload* igGetDragDropPayload()
{
return ImGui::GetDragDropPayload();
}
CIMGUI_API void igPushClipRect(const ImVec2 clip_rect_min,const ImVec2 clip_rect_max,bool intersect_with_current_clip_rect)
{
return ImGui::PushClipRect(clip_rect_min,clip_rect_max,intersect_with_current_clip_rect);
@@ -2162,7 +2166,7 @@ CIMGUI_API const char* ImFont_CalcWordWrapPositionA(ImFont* self,float scale,con
{
return self->CalcWordWrapPositionA(scale,text,text_end,wrap_width);
}
CIMGUI_API void ImFont_RenderChar(ImFont* self,ImDrawList* draw_list,float size,ImVec2 pos,ImU32 col,unsigned short c)
CIMGUI_API void ImFont_RenderChar(ImFont* self,ImDrawList* draw_list,float size,ImVec2 pos,ImU32 col,ImWchar c)
{
return self->RenderChar(draw_list,size,pos,col,c);
}