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

better naming of overloaded methods (issue #1)

Browse Source
This commit is contained in:
Stephan Dilly
2015-04-09 23:33:02 +02:00
parent 5b12bb8e2f
commit b6fd8e0d7b
3 changed files with 37 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cimgui/Makefile
View File

@@ -26,7 +26,7 @@ ifeq ($(UNAME_S), Darwin) #APPLE
OUTPUTNAME = cimgui.dylib
CXXFLAGS = -I/usr/local/include
CXXFLAGS += -Wall
CXXFLAGS += -dynamiclib
LINKFLAGS = -dynamiclib
CFLAGS = $(CXXFLAGS)
endif
@@ -37,7 +37,7 @@ all:imgui_example
@echo Build complete for $(ECHO_MESSAGE)
imgui_example:$(OBJS)
$(CXX) -o $(OUTPUTNAME) $(OBJS) $(CXXFLAGS)
$(CXX) -o $(OUTPUTNAME) $(OBJS) $(CXXFLAGS) $(LINKFLAGS)
clean:
rm $(OBJS)

36
cimgui/cimgui.cpp
View File

@@ -69,7 +69,7 @@ CIMGUI_API bool ig_BeginChild(const char* str_id, const ImVec2 size, bool border
return ImGui::BeginChild(str_id, size, border, extra_flags);
}
CIMGUI_API bool ig_BeginChild2(ImGuiID id, const ImVec2 size, bool border, ImGuiWindowFlags extra_flags)
CIMGUI_API bool ig_BeginChildEx(ImGuiID id, const ImVec2 size, bool border, ImGuiWindowFlags extra_flags)
{
return ImGui::BeginChild(id, size, border, extra_flags);
}
@@ -174,7 +174,7 @@ CIMGUI_API void ig_SetWindowFocus()
ImGui::SetWindowFocus();
}
CIMGUI_API void ig_SetWindowPos2(const char* name, const ImVec2 pos, ImGuiSetCond cond)
CIMGUI_API void ig_SetWindowPosByName(const char* name, const ImVec2 pos, ImGuiSetCond cond)
{
ImGui::SetWindowPos(name,pos,cond);
}
@@ -460,17 +460,17 @@ CIMGUI_API float ig_GetTextLineHeightWithSpacing()
// ID scopes
// If you are creating widgets in a loop you most likely want to push a unique identifier so ImGui can differentiate them
// You can also use "##extra" within your widget name to distinguish them from each others (see 'Programmer Guide')
CIMGUI_API void ig_PushID(const char* str_id)
CIMGUI_API void ig_PushIdStr(const char* str_id)
{
return ImGui::PushID(str_id);
}
CIMGUI_API void ig_PushID2(const void* ptr_id)
CIMGUI_API void ig_PushIdPtr(const void* ptr_id)
{
return ImGui::PushID(ptr_id);
}
CIMGUI_API void ig_PushID3(const int int_id)
CIMGUI_API void ig_PushIdInt(const int int_id)
{
return ImGui::PushID(int_id);
}
@@ -606,12 +606,12 @@ CIMGUI_API bool ig_CheckboxFlags(const char* label, unsigned int* flags, unsi
return ImGui::CheckboxFlags(label, flags, flags_value);
}
CIMGUI_API bool ig_RadioButton(const char* label, bool active)
CIMGUI_API bool ig_RadioButtonBool(const char* label, bool active)
{
return ImGui::RadioButton(label, active);
}
CIMGUI_API bool ig_RadioButton2(const char* label, int* v, int v_button)
CIMGUI_API bool ig_RadioButton(const char* label, int* v, int v_button)
{
return ImGui::RadioButton(label, v, v_button);
}
@@ -792,7 +792,7 @@ CIMGUI_API bool ig_TreeNode(const char* str_label_id)
return ImGui::TreeNode(str_label_id);
}
CIMGUI_API bool ig_TreeNode2(const char* str_id, const char* fmt, ...)
CIMGUI_API bool ig_TreeNodeStr(const char* str_id, const char* fmt, ...)
{
va_list args;
va_start(args, fmt);
@@ -802,7 +802,7 @@ CIMGUI_API bool ig_TreeNode2(const char* str_id, const char* fmt, ...)
return res;
}
CIMGUI_API bool ig_TreeNode3(const void* ptr_id, const char* fmt, ...)
CIMGUI_API bool ig_TreeNodePtr(const void* ptr_id, const char* fmt, ...)
{
va_list args;
va_start(args, fmt);
@@ -812,22 +812,22 @@ CIMGUI_API bool ig_TreeNode3(const void* ptr_id, const char* fmt, ...)
return res;
}
CIMGUI_API bool ig_TreeNodeV(const char* str_id, const char* fmt, va_list args)
CIMGUI_API bool ig_TreeNodeStrV(const char* str_id, const char* fmt, va_list args)
{
return ImGui::TreeNodeV(str_id,fmt,args);
}
CIMGUI_API bool ig_TreeNodeV2(const void* ptr_id, const char* fmt, va_list args)
CIMGUI_API bool ig_TreeNodePtrV(const void* ptr_id, const char* fmt, va_list args)
{
return ImGui::TreeNodeV(ptr_id, fmt, args);
}
CIMGUI_API void ig_TreePush(const char* str_id)
CIMGUI_API void ig_TreePushStr(const char* str_id)
{
return ImGui::TreePush(str_id);
}
CIMGUI_API void ig_TreePush2(const void* ptr_id)
CIMGUI_API void ig_TreePushPtr(const void* ptr_id)
{
return ImGui::TreePush(ptr_id);
}
@@ -848,7 +848,7 @@ CIMGUI_API bool ig_Selectable(const char* label, bool selected, const ImVec2
return ImGui::Selectable(label, selected, size);
}
CIMGUI_API bool ig_Selectable2(const char* label, bool* p_selected, const ImVec2 size)
CIMGUI_API bool ig_SelectableEx(const char* label, bool* p_selected, const ImVec2 size)
{
return ImGui::Selectable(label,p_selected,size);
}
@@ -879,22 +879,22 @@ CIMGUI_API void ig_ListBoxFooter()
}
// Widgets: Value() Helpers. Output single value in "name: value" format (tip: freely declare your own within the ImGui namespace!)
CIMGUI_API void ig_Value(const char* prefix, bool b)
CIMGUI_API void ig_ValueBool(const char* prefix, bool b)
{
ImGui::Value(prefix, b);
}
CIMGUI_API void ig_Value2(const char* prefix, int v)
CIMGUI_API void ig_ValueInt(const char* prefix, int v)
{
ImGui::Value(prefix, v);
}
CIMGUI_API void ig_Value3(const char* prefix, unsigned int v)
CIMGUI_API void ig_ValueUInt(const char* prefix, unsigned int v)
{
ImGui::Value(prefix, v);
}
CIMGUI_API void ig_Value4(const char* prefix, float v, const char* float_format)
CIMGUI_API void ig_ValueFloat(const char* prefix, float v, const char* float_format)
{
ImGui::Value(prefix,v,float_format);
}

34
cimgui/cimgui.h
View File

@@ -36,7 +36,7 @@ CIMGUI_API bool ig_Begin(const char* name, bool* p_opened, ImGuiWindowFlags f
CIMGUI_API bool ig_Begin2(const char* name, bool* p_opened, const struct ImVec2 size_on_first_use, float bg_alpha, ImGuiWindowFlags flags);
CIMGUI_API void ig_End();
CIMGUI_API bool ig_BeginChild(const char* str_id, const struct ImVec2 size, bool border, ImGuiWindowFlags extra_flags);
CIMGUI_API bool ig_BeginChild2(ImGuiID id, const struct ImVec2 size, bool border, ImGuiWindowFlags extra_flags);
CIMGUI_API bool ig_BeginChildEx(ImGuiID id, const struct ImVec2 size, bool border, ImGuiWindowFlags extra_flags);
CIMGUI_API void ig_EndChild();
CIMGUI_API void ig_GetContentRegionMax(struct ImVec2* out);
CIMGUI_API void ig_GetWindowContentRegionMin(struct ImVec2* out);
@@ -58,7 +58,7 @@ CIMGUI_API void ig_SetWindowPos(const struct ImVec2 pos, ImGuiSetCond cond);
CIMGUI_API void ig_SetWindowSize(const struct ImVec2 size, ImGuiSetCond cond);
CIMGUI_API void ig_SetWindowCollapsed(bool collapsed, ImGuiSetCond cond);
CIMGUI_API void ig_SetWindowFocus();
CIMGUI_API void ig_SetWindowPos2(const char* name, const struct ImVec2 pos, ImGuiSetCond cond);
CIMGUI_API void ig_SetWindowPosByName(const char* name, const struct ImVec2 pos, ImGuiSetCond cond);
CIMGUI_API void ig_SetWindowSize2(const char* name, const struct ImVec2 size, ImGuiSetCond cond);
CIMGUI_API void ig_SetWindowCollapsed2(const char* name, bool collapsed, ImGuiSetCond cond);
CIMGUI_API void ig_SetWindowFocus2(const char* name);
@@ -129,8 +129,8 @@ CIMGUI_API float ig_GetTextLineHeightWithSpacing();
// If you are creating widgets in a loop you most likely want to push a unique identifier so ImGui can differentiate them
// You can also use "##extra" within your widget name to distinguish them from each others (see 'Programmer Guide')
CIMGUI_API void ig_PushID(const char* str_id);
CIMGUI_API void ig_PushID2(const void* ptr_id);
CIMGUI_API void ig_PushID3(const int int_id);
CIMGUI_API void ig_PushIdPtr(const void* ptr_id);
CIMGUI_API void ig_PushIdInt(const int int_id);
CIMGUI_API void ig_PopID();
CIMGUI_API ImGuiID ig_GetID(const char* str_id);
CIMGUI_API ImGuiID ig_GetID2(const void* ptr_id);
@@ -156,8 +156,8 @@ CIMGUI_API bool ig_ImageButton(ImTextureID user_texture_id, const struct ImVe
CIMGUI_API bool ig_CollapsingHeader(const char* label, const char* str_id, bool display_frame, bool default_open);
CIMGUI_API bool ig_Checkbox(const char* label, bool* v);
CIMGUI_API bool ig_CheckboxFlags(const char* label, unsigned int* flags, unsigned int flags_value);
CIMGUI_API bool ig_RadioButton(const char* label, bool active);
CIMGUI_API bool ig_RadioButton2(const char* label, int* v, int v_button);
CIMGUI_API bool ig_RadioButtonBool(const char* label, bool active);
CIMGUI_API bool ig_RadioButton(const char* label, int* v, int v_button);
CIMGUI_API bool ig_Combo(const char* label, int* current_item, const char** items, int items_count, int height_in_items);
CIMGUI_API bool ig_Combo2(const char* label, int* current_item, const char* items_separated_by_zeros, int height_in_items);
CIMGUI_API bool ig_Combo3(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);
@@ -201,18 +201,18 @@ CIMGUI_API bool ig_InputInt4(const char* label, int v[4]);
// Widgets: Trees
CIMGUI_API bool ig_TreeNode(const char* str_label_id);
CIMGUI_API bool ig_TreeNode2(const char* str_id, const char* fmt, ...);
CIMGUI_API bool ig_TreeNode3(const void* ptr_id, const char* fmt, ...);
CIMGUI_API bool ig_TreeNodeV(const char* str_id, const char* fmt, va_list args);
CIMGUI_API bool ig_TreeNodeV2(const void* ptr_id, const char* fmt, va_list args);
CIMGUI_API void ig_TreePush(const char* str_id);
CIMGUI_API void ig_TreePush2(const void* ptr_id);
CIMGUI_API bool ig_TreeNodeStr(const char* str_id, const char* fmt, ...);
CIMGUI_API bool ig_TreeNodePtr(const void* ptr_id, const char* fmt, ...);
CIMGUI_API bool ig_TreeNodeStrV(const char* str_id, const char* fmt, va_list args);
CIMGUI_API bool ig_TreeNodePtrV(const void* ptr_id, const char* fmt, va_list args);
CIMGUI_API void ig_TreePushStr(const char* str_id);
CIMGUI_API void ig_TreePushPtr(const void* ptr_id);
CIMGUI_API void ig_TreePop();
CIMGUI_API void ig_SetNextTreeNodeOpened(bool opened, ImGuiSetCond cond);
// Widgets: Selectable / Lists
CIMGUI_API bool ig_Selectable(const char* label, bool selected, const struct ImVec2 size);
CIMGUI_API bool ig_Selectable2(const char* label, bool* p_selected, const struct ImVec2 size);
CIMGUI_API bool ig_SelectableEx(const char* label, bool* p_selected, const struct ImVec2 size);
CIMGUI_API bool ig_ListBox(const char* label, int* current_item, const char** items, int items_count, int height_in_items);
CIMGUI_API bool ig_ListBox2(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 ig_ListBoxHeader(const char* label, const struct ImVec2 size);
@@ -220,10 +220,10 @@ CIMGUI_API bool ig_ListBoxHeader2(const char* label, int items_count, int hei
CIMGUI_API void ig_ListBoxFooter();
// Widgets: Value() Helpers. Output single value in "name: value" format (tip: freely declare your own within the ImGui namespace!)
CIMGUI_API void ig_Value(const char* prefix, bool b);
CIMGUI_API void ig_Value2(const char* prefix, int v);
CIMGUI_API void ig_Value3(const char* prefix, unsigned int v);
CIMGUI_API void ig_Value4(const char* prefix, float v, const char* float_format);
CIMGUI_API void ig_ValueBool(const char* prefix, bool b);
CIMGUI_API void ig_ValueInt(const char* prefix, int v);
CIMGUI_API void ig_ValueUInt(const char* prefix, unsigned int v);
CIMGUI_API void ig_ValueFloat(const char* prefix, float v, const char* float_format);
CIMGUI_API void ig_Color(const char* prefix, const struct ImVec4 v);
CIMGUI_API void ig_Color2(const char* prefix, unsigned int v);