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

some function renaming

Browse Source
This commit is contained in:
sonoro1234
2018-05-18 18:08:21 +02:00
parent e559e1eab8
commit fa5d113cdb
4 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cimgui/cimgui.cpp
View File

@@ -308,7 +308,7 @@ CIMGUI_API ImVec2 igGetFontTexUvWhitePixel()
{ {
return ImGui::GetFontTexUvWhitePixel(); return ImGui::GetFontTexUvWhitePixel();
} }
CIMGUI_API ImU32 igGetColorU32Col(ImGuiCol idx,float alpha_mul) CIMGUI_API ImU32 igGetColorU32(ImGuiCol idx,float alpha_mul)
{ {
return ImGui::GetColorU32(idx,alpha_mul); return ImGui::GetColorU32(idx,alpha_mul);
} }
@@ -1589,7 +1589,7 @@ CIMGUI_API void ImDrawList_AddCircleFilled(ImDrawList* self,const ImVec2 centre
{ {
return self->AddCircleFilled(centre,radius,col,num_segments); return self->AddCircleFilled(centre,radius,col,num_segments);
} }
CIMGUI_API void ImDrawList_AddTextVec2(ImDrawList* self,const ImVec2 pos,ImU32 col,const char* text_begin,const char* text_end) 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); return self->AddText(pos,col,text_begin,text_end);
} }

4
cimgui/cimgui.h
View File

@@ -866,7 +866,7 @@ CIMGUI_API const ImVec4* igGetStyleColorVec4(ImGuiCol idx);
CIMGUI_API ImFont* igGetFont(); CIMGUI_API ImFont* igGetFont();
CIMGUI_API float igGetFontSize(); CIMGUI_API float igGetFontSize();
CIMGUI_API ImVec2 igGetFontTexUvWhitePixel(); CIMGUI_API ImVec2 igGetFontTexUvWhitePixel();
CIMGUI_API ImU32 igGetColorU32Col(ImGuiCol idx,float alpha_mul); CIMGUI_API ImU32 igGetColorU32(ImGuiCol idx,float alpha_mul);
CIMGUI_API ImU32 igGetColorU32Vec4(const ImVec4 col); CIMGUI_API ImU32 igGetColorU32Vec4(const ImVec4 col);
CIMGUI_API ImU32 igGetColorU32U32(ImU32 col); CIMGUI_API ImU32 igGetColorU32U32(ImU32 col);
CIMGUI_API void igPushItemWidth(float item_width); CIMGUI_API void igPushItemWidth(float item_width);
@@ -1178,7 +1178,7 @@ CIMGUI_API void ImDrawList_AddTriangle(ImDrawList* self,const ImVec2 a,const Im
CIMGUI_API void ImDrawList_AddTriangleFilled(ImDrawList* self,const ImVec2 a,const ImVec2 b,const ImVec2 c,ImU32 col); CIMGUI_API void ImDrawList_AddTriangleFilled(ImDrawList* self,const ImVec2 a,const ImVec2 b,const ImVec2 c,ImU32 col);
CIMGUI_API void ImDrawList_AddCircle(ImDrawList* self,const ImVec2 centre,float radius,ImU32 col,int num_segments,float thickness); CIMGUI_API void ImDrawList_AddCircle(ImDrawList* self,const ImVec2 centre,float radius,ImU32 col,int num_segments,float thickness);
CIMGUI_API void ImDrawList_AddCircleFilled(ImDrawList* self,const ImVec2 centre,float radius,ImU32 col,int num_segments); CIMGUI_API void ImDrawList_AddCircleFilled(ImDrawList* self,const ImVec2 centre,float radius,ImU32 col,int num_segments);
CIMGUI_API void ImDrawList_AddTextVec2(ImDrawList* self,const ImVec2 pos,ImU32 col,const char* text_begin,const char* text_end); CIMGUI_API void ImDrawList_AddText(ImDrawList* self,const ImVec2 pos,ImU32 col,const char* text_begin,const char* text_end);
CIMGUI_API void ImDrawList_AddTextFontPtr(ImDrawList* self,const ImFont* font,float font_size,const ImVec2 pos,ImU32 col,const char* text_begin,const char* text_end,float wrap_width,const ImVec4* cpu_fine_clip_rect); CIMGUI_API void ImDrawList_AddTextFontPtr(ImDrawList* self,const ImFont* font,float font_size,const ImVec2 pos,ImU32 col,const char* text_begin,const char* text_end,float wrap_width,const ImVec4* cpu_fine_clip_rect);
CIMGUI_API void ImDrawList_AddImage(ImDrawList* self,ImTextureID user_texture_id,const ImVec2 a,const ImVec2 b,const ImVec2 uv_a,const ImVec2 uv_b,ImU32 col); CIMGUI_API void ImDrawList_AddImage(ImDrawList* self,ImTextureID user_texture_id,const ImVec2 a,const ImVec2 b,const ImVec2 uv_a,const ImVec2 uv_b,ImU32 col);
CIMGUI_API void ImDrawList_AddImageQuad(ImDrawList* self,ImTextureID user_texture_id,const ImVec2 a,const ImVec2 b,const ImVec2 c,const ImVec2 d,const ImVec2 uv_a,const ImVec2 uv_b,const ImVec2 uv_c,const ImVec2 uv_d,ImU32 col); CIMGUI_API void ImDrawList_AddImageQuad(ImDrawList* self,ImTextureID user_texture_id,const ImVec2 a,const ImVec2 b,const ImVec2 c,const ImVec2 d,const ImVec2 uv_a,const ImVec2 uv_b,const ImVec2 uv_c,const ImVec2 uv_d,ImU32 col);

3
cimgui/generator/generator.bat
View File

@@ -2,7 +2,8 @@ rem this is used to rebuild imgui_structs.h
rem set your PATH if necessary for gcc and lua with: rem set your PATH if necessary for gcc and lua with:
set PATH=%PATH%;C:\mingw32\bin;C:\luaGL; set PATH=%PATH%;C:\mingw32\bin;C:\luaGL;
rem gcc -E -C -DIMGUI_DISABLE_OBSOLETE_FUNCTIONS ../../imgui/imgui.h | luajit.exe ./generator.lua > out.txt
gcc -E -DIMGUI_DISABLE_OBSOLETE_FUNCTIONS ../../imgui/imgui.h | luajit.exe ./generator.lua > out.txt gcc -E -DIMGUI_DISABLE_OBSOLETE_FUNCTIONS ../../imgui/imgui.h | luajit.exe ./generator.lua > out.txt
rem gcc -E ../imgui/imgui.h > imgui_structs.raw rem gcc -E -CC -DIMGUI_DISABLE_OBSOLETE_FUNCTIONS ../../imgui/imgui.h > imgui_structs2.raw
cmd /k cmd /k

6
cimgui/generator/generator.lua
View File

@@ -21,6 +21,12 @@ local cimgui_overloads = {
--["(const void*)"] = "igPushIDPtr", --["(const void*)"] = "igPushIDPtr",
--["(int)"] = "igPushIDInt" --["(int)"] = "igPushIDInt"
}, },
ImDrawList_AddText = {
["(const ImVec2,ImU32,const char*,const char*)"] = "ImDrawList_AddText",
},
igGetColorU32 = {
["(ImGuiCol,float)"] = "igGetColorU32",
},
igCollapsingHeader = { igCollapsingHeader = {
["(const char*,ImGuiTreeNodeFlags)"] = "igCollapsingHeader" ["(const char*,ImGuiTreeNodeFlags)"] = "igCollapsingHeader"
} }