revert missing ImFontConfig_DefaultConstructor, fix fn name ImFont_GetFallbackAdvanceX

* Update to imgui v1.52
* Fixed missing ig prefix and struct identifier
* missing struct identifier
* Removed obsolete functions
* Possible fix
* Removed wild ImFont::Glyph
* Noticed out of order Color enum value

.gitignore

@@ -35,3 +35,4 @@ cimgui/Release/
 CMakeLists.txt
 cimgui/.vs/
 cimgui/cimgui.vcxproj.user
+cimgui/x64/

.travis.yml

@@ -7,5 +7,6 @@ compiler:
   - gcc
   - clang
 
-script: 
+script:
   - make -C cimgui
+  - $CC cimgui/cimgui.h    # Make sure we can include in a plain C compiler

README.md

@@ -1,13 +1,13 @@
 # cimgui [![Build Status](https://travis-ci.org/Extrawurst/cimgui.svg)](https://travis-ci.org/Extrawurst/cimgui)
 
-![sample](https://raw.github.com/extrawurst/cimgui/master/Screen Shot 2015-04-09.png)
+![sample](screenshot.png)
 
 This is a thin c-api wrapper for the excellent C++ intermediate gui [imgui](https://github.com/ocornut/imgui).
 Most of the functions have wrapper counterparts now, missing stuff is added on a as-needed basis (PR welcome).
 This library is intended as a intermediate layer to be able to use imgui from other languages that can interface with C (like D - see [D-binding](https://github.com/Extrawurst/DerelictImgui))
 
 Notes:
-* currently this wrapper is based on version [1.47 of imgui](https://github.com/ocornut/imgui/releases/tag/v1.47)
+* currently this wrapper is based on version [1.52 of imgui](https://github.com/ocornut/imgui/releases/tag/v1.52)
 * does not compile with pure C compiler yet (for writing bindings in languages that are able to use C-ABI it is enough though, see D-bindings)
 
 # usage
@@ -16,3 +16,11 @@ Notes:
 * make using makefile on linux/osx
 * use whatever method is in ImGui c++ namespace in the original [imgui.h](https://github.com/ocornut/imgui/blob/master/imgui.h) by prepending `ig`
 * methods have the same parameter list and return values (where possible)
+
+# example bindings based on cimgui
+
+* [DerelictImgui](https://github.com/Extrawurst/DerelictImgui)
+* [ImGui.NET](https://github.com/mellinoe/ImGui.NET)
+* [imgui-rs](https://github.com/Gekkio/imgui-rs)
+* [imgui-pas](https://github.com/dpethes/imgui-pas)
+* [odin-dear_imgui](https://github.com/ThisDrunkDane/odin-dear_imgui)

cimgui/.vscode/settings.json

@@ -0,0 +1,4 @@
+// Place your settings in this file to overwrite default and user settings.
+{
+    "editor.formatOnSave": false,
+}

cimgui/Makefile

@@ -3,8 +3,9 @@
 # Compatible with Ubuntu 14.04.1 and Mac OS X
 
 OBJS = cimgui.o
-OBJS += fontAtlas.o 
+OBJS += fontAtlas.o
 OBJS += drawList.o
+OBJS += listClipper.o
 #OBJS += test.o
 OBJS += ../imgui/imgui.o
 OBJS += ../imgui/imgui_draw.o
@@ -32,6 +33,17 @@ ifeq ($(UNAME_S), Darwin) #APPLE
 	CFLAGS = $(CXXFLAGS)
 endif
 
+ifeq ($(OS), Windows_NT)
+	ECHO_MESSAGE = "Windows"
+
+	OUTPUTNAME = cimgui.dll
+	CXXFLAGS = -I../../
+	CXXFLAGS += -Wall
+	CXXFLAGS += -shared
+	LINKFLAGS = -limm32
+	CFLAGS = $(CXXFLAGS)
+endif
+
 .cpp.o:
 	$(CXX) $(CXXFLAGS) -c -o $@ $<
 

cimgui/cimgui.cpp

@@ -2,6 +2,10 @@
 #include "../imgui/imgui.h"
 #include "cimgui.h"
 
+// to use placement new
+#define IMGUI_DEFINE_PLACEMENT_NEW
+#include "../imgui/imgui_internal.h"
+
 CIMGUI_API ImGuiIO* igGetIO()
 {
     return &ImGui::GetIO();
@@ -144,26 +148,31 @@ CIMGUI_API bool igIsWindowCollapsed()
     return ImGui::IsWindowCollapsed();
 }
 
+CIMGUI_API bool igIsWindowAppearing()
+{
+	return ImGui::IsWindowAppearing();
+}
+
 CIMGUI_API void igSetWindowFontScale(float scale)
 {
     ImGui::SetWindowFontScale(scale);
 }
 
-CIMGUI_API void igSetNextWindowPos(CONST ImVec2 pos, ImGuiSetCond cond)
+CIMGUI_API void igSetNextWindowPos(CONST struct ImVec2 pos, ImGuiCond cond, CONST struct ImVec2 pivot)
 {
-    ImGui::SetNextWindowPos(pos, cond);
+    ImGui::SetNextWindowPos(pos, cond, pivot);
 }
 
-CIMGUI_API void igSetNextWindowPosCenter(ImGuiSetCond cond)
-{
-    ImGui::SetNextWindowPosCenter(cond);
-}
-
-CIMGUI_API void igSetNextWindowSize(CONST ImVec2 size, ImGuiSetCond cond)
+CIMGUI_API void igSetNextWindowSize(CONST ImVec2 size, ImGuiCond cond)
 {
     ImGui::SetNextWindowSize(size, cond);
 }
 
+CIMGUI_API void igSetNextWindowSizeConstraints(CONST struct ImVec2 size_min, CONST struct ImVec2 size_max, ImGuiSizeConstraintCallback custom_callback, void* custom_callback_data)
+{
+    ImGui::SetNextWindowSizeConstraints(size_min, size_max, custom_callback, custom_callback_data);
+}
+
 CIMGUI_API void igSetNextWindowContentSize(CONST ImVec2 size)
 {
     ImGui::SetNextWindowContentSize(size);
@@ -174,7 +183,7 @@ CIMGUI_API void igSetNextWindowContentWidth(float width)
     ImGui::SetNextWindowContentWidth(width);
 }
 
-CIMGUI_API void igSetNextWindowCollapsed(bool collapsed, ImGuiSetCond cond)
+CIMGUI_API void igSetNextWindowCollapsed(bool collapsed, ImGuiCond cond)
 {
     ImGui::SetNextWindowCollapsed(collapsed,cond);
 }
@@ -184,17 +193,17 @@ CIMGUI_API void igSetNextWindowFocus()
     ImGui::SetNextWindowFocus();
 }
 
-CIMGUI_API void igSetWindowPos(CONST ImVec2 pos, ImGuiSetCond cond)
+CIMGUI_API void igSetWindowPos(CONST ImVec2 pos, ImGuiCond cond)
 {
     ImGui::SetWindowPos(pos,cond);
 }
 
-CIMGUI_API void igSetWindowSize(CONST ImVec2 size, ImGuiSetCond cond)
+CIMGUI_API void igSetWindowSize(CONST ImVec2 size, ImGuiCond cond)
 {
     ImGui::SetWindowSize(size, cond);
 }
 
-CIMGUI_API void igSetWindowCollapsed(bool collapsed, ImGuiSetCond cond)
+CIMGUI_API void igSetWindowCollapsed(bool collapsed, ImGuiCond cond)
 {
     ImGui::SetWindowCollapsed(collapsed,cond);
 }
@@ -204,17 +213,17 @@ CIMGUI_API void igSetWindowFocus()
     ImGui::SetWindowFocus();
 }
 
-CIMGUI_API void igSetWindowPosByName(CONST char* name, CONST ImVec2 pos, ImGuiSetCond cond)
+CIMGUI_API void igSetWindowPosByName(CONST char* name, CONST ImVec2 pos, ImGuiCond cond)
 {
     ImGui::SetWindowPos(name,pos,cond);
 }
 
-CIMGUI_API void igSetWindowSize2(CONST char* name, CONST ImVec2 size, ImGuiSetCond cond)
+CIMGUI_API void igSetWindowSize2(CONST char* name, CONST ImVec2 size, ImGuiCond cond)
 {
     ImGui::SetWindowSize(name, size, cond);
 }
 
-CIMGUI_API void igSetWindowCollapsed2(CONST char* name, bool collapsed, ImGuiSetCond cond)
+CIMGUI_API void igSetWindowCollapsed2(CONST char* name, bool collapsed, ImGuiCond cond)
 {
     ImGui::SetWindowCollapsed(name, collapsed, cond);
 }
@@ -290,6 +299,11 @@ CIMGUI_API void igPopFont()
     return ImGui::PopFont();
 }
 
+CIMGUI_API void igPushStyleColorU32(ImGuiCol idx, ImU32 col)
+{
+    return ImGui::PushStyleColor(idx, col);
+}
+
 CIMGUI_API void igPushStyleColor(ImGuiCol idx, CONST ImVec4 col)
 {
     return ImGui::PushStyleColor(idx, col);
@@ -315,6 +329,11 @@ CIMGUI_API void igPopStyleVar(int count)
     return ImGui::PopStyleVar(count);
 }
 
+CIMGUI_API void igGetStyleColorVec4(ImVec4* pOut, ImGuiCol idx)
+{
+    *pOut = ImGui::GetStyleColorVec4(idx);
+}
+
 CIMGUI_API ImFont* igGetFont()
 {
     return ImGui::GetFont();
@@ -340,6 +359,11 @@ CIMGUI_API ImU32 igGetColorU32Vec(CONST ImVec4* col)
     return ImGui::GetColorU32(*col);
 }
 
+CIMGUI_API ImU32 igGetColorU32U32(ImU32 col)
+{
+    return ImGui::GetColorU32(col);
+}
+
 // Parameters stacks (current window)
 CIMGUI_API void igPushItemWidth(float item_width)
 {
@@ -416,14 +440,19 @@ CIMGUI_API void igOpenPopup(CONST char* str_id)
     return ImGui::OpenPopup(str_id);
 }
 
+CIMGUI_API bool igOpenPopupOnItemClick(const char * str_id, int mouse_button)
+{
+	return ImGui::OpenPopupOnItemClick(str_id, mouse_button);
+}
+
 CIMGUI_API bool igBeginPopup(CONST char* str_id)
 {
     return ImGui::BeginPopup(str_id);
 }
 
-CIMGUI_API bool igBeginPopupModal(CONST char* name, bool* p_opened, ImGuiWindowFlags extra_flags)
+CIMGUI_API bool igBeginPopupModal(CONST char* name, bool* p_open, ImGuiWindowFlags extra_flags)
 {
-    return ImGui::BeginPopupModal(name, p_opened, extra_flags);
+    return ImGui::BeginPopupModal(name, p_open, extra_flags);
 }
 
 CIMGUI_API bool igBeginPopupContextItem(CONST char* str_id, int mouse_button)
@@ -431,9 +460,9 @@ CIMGUI_API bool igBeginPopupContextItem(CONST char* str_id, int mouse_button)
     return ImGui::BeginPopupContextItem(str_id, mouse_button);
 }
 
-CIMGUI_API bool igBeginPopupContextWindow(bool also_over_items, CONST char* str_id, int mouse_button)
+CIMGUI_API bool igBeginPopupContextWindow(CONST char* str_id, int mouse_button, bool also_over_items)
 {
-    return ImGui::BeginPopupContextWindow(also_over_items, str_id, mouse_button);
+    return ImGui::BeginPopupContextWindow(str_id, mouse_button, also_over_items);
 }
 
 CIMGUI_API bool igBeginPopupContextVoid(CONST char* str_id, int mouse_button)
@@ -446,21 +475,17 @@ CIMGUI_API void igEndPopup()
     return ImGui::EndPopup();
 }
 
+CIMGUI_API bool igIsPopupOpen(CONST char* str_id)
+{
+    return ImGui::IsPopupOpen(str_id);
+}
+
 CIMGUI_API void igCloseCurrentPopup()
 {
     return ImGui::CloseCurrentPopup();
 }
 
 // Layout
-CIMGUI_API void igBeginGroup()
-{
-    return ImGui::BeginGroup();
-}
-
-CIMGUI_API void igEndGroup()
-{
-    return ImGui::EndGroup();
-}
 
 CIMGUI_API void igSeparator()
 {
@@ -472,6 +497,11 @@ CIMGUI_API void igSameLine(float pos_x, float spacing_w)
     return ImGui::SameLine(pos_x, spacing_w);
 }
 
+CIMGUI_API void igNewLine()
+{
+    return ImGui::NewLine();
+}
+
 CIMGUI_API void igSpacing()
 {
     return ImGui::Spacing();
@@ -482,14 +512,24 @@ CIMGUI_API void igDummy(CONST ImVec2* size)
     return ImGui::Dummy(*size);
 }
 
-CIMGUI_API void igIndent()
+CIMGUI_API void igIndent(float indent_w)
 {
-    return ImGui::Indent();
+    return ImGui::Indent(indent_w);
 }
 
-CIMGUI_API void igUnindent()
+CIMGUI_API void igUnindent(float indent_w)
 {
-    return ImGui::Unindent();
+    return ImGui::Unindent(indent_w);
+}
+
+CIMGUI_API void igBeginGroup()
+{
+    return ImGui::BeginGroup();
+}
+
+CIMGUI_API void igEndGroup()
+{
+    return ImGui::EndGroup();
 }
 
 CIMGUI_API void igGetCursorPos(ImVec2* pOut)
@@ -537,9 +577,9 @@ CIMGUI_API void igSetCursorScreenPos(CONST ImVec2 pos)
     return ImGui::SetCursorScreenPos(pos);
 }
 
-CIMGUI_API void igAlignFirstTextHeightToWidgets()
+CIMGUI_API void igAlignTextToFramePadding()
 {
-    return ImGui::AlignFirstTextHeightToWidgets();
+	return ImGui::AlignTextToFramePadding();
 }
 
 CIMGUI_API float igGetTextLineHeight()
@@ -574,6 +614,16 @@ CIMGUI_API int igGetColumnIndex()
     return ImGui::GetColumnIndex();
 }
 
+CIMGUI_API float igGetColumnWidth(int column_index)
+{
+    return ImGui::GetColumnWidth(column_index);
+}
+
+CIMGUI_API void igSetColumnWidth(int column_index, float width)
+{
+    return ImGui::SetColumnWidth(column_index, width);
+}
+
 CIMGUI_API float igGetColumnOffset(int column_index)
 {
     return ImGui::GetColumnOffset(column_index);
@@ -584,11 +634,6 @@ CIMGUI_API void igSetColumnOffset(int column_index, float offset_x)
     return ImGui::SetColumnOffset(column_index, offset_x);
 }
 
-CIMGUI_API float igGetColumnWidth(int column_index)
-{
-    return ImGui::GetColumnWidth(column_index);
-}
-
 CIMGUI_API int igGetColumnsCount()
 {
     return ImGui::GetColumnsCount();
@@ -597,43 +642,43 @@ CIMGUI_API int igGetColumnsCount()
 // 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 igPushIdStr(CONST char* str_id)
+CIMGUI_API void igPushIDStr(CONST char* str_id)
 {
     return ImGui::PushID(str_id);
 }
 
-CIMGUI_API void igPushIdStrRange(CONST char* str_begin, CONST char* str_end)
+CIMGUI_API void igPushIDStrRange(CONST char* str_begin, CONST char* str_end)
 {
     return ImGui::PushID(str_begin, str_end);
 }
 
 
-CIMGUI_API void igPushIdPtr(CONST void* ptr_id)
+CIMGUI_API void igPushIDPtr(CONST void* ptr_id)
 {
     return ImGui::PushID(ptr_id);
 }
 
-CIMGUI_API void igPushIdInt(int int_id)
+CIMGUI_API void igPushIDInt(int int_id)
 {
     return ImGui::PushID(int_id);
 }
 
-CIMGUI_API void igPopId()
+CIMGUI_API void igPopID()
 {
     return ImGui::PopID();
 }
 
-CIMGUI_API ImGuiID igGetIdStr(CONST char* str_id)
+CIMGUI_API ImGuiID igGetIDStr(CONST char* str_id)
 {
     return ImGui::GetID(str_id);
 }
 
-CIMGUI_API ImGuiID igGetIdStrRange(CONST char* str_begin, CONST char* str_end)
+CIMGUI_API ImGuiID igGetIDStrRange(CONST char* str_begin, CONST char* str_end)
 {
     return ImGui::GetID(str_begin, str_end);
 }
 
-CIMGUI_API ImGuiID igGetIdPtr(CONST void* ptr_id)
+CIMGUI_API ImGuiID igGetIDPtr(CONST void* ptr_id)
 {
     return ImGui::GetID(ptr_id);
 }
@@ -752,11 +797,6 @@ CIMGUI_API bool igImageButton(ImTextureID user_texture_id, CONST ImVec2 size, CO
     return ImGui::ImageButton(user_texture_id, size, uv0, uv1, frame_padding, bg_col, tint_col);
 }
 
-CIMGUI_API bool igCollapsingHeader(CONST char* label, CONST char* str_id, bool display_frame, bool default_open)
-{
-    return ImGui::CollapsingHeader(label, str_id, display_frame, default_open);
-}
-
 CIMGUI_API bool igCheckbox(CONST char* label, bool* v)
 {
     return ImGui::Checkbox(label, v);
@@ -777,7 +817,7 @@ CIMGUI_API bool igRadioButton(CONST char* label, int* v, int v_button)
     return ImGui::RadioButton(label, v, v_button);
 }
 
-CIMGUI_API bool igCombo(CONST char* label, int* current_item, CONST char** items, int items_count, int height_in_items)
+CIMGUI_API bool igCombo(CONST char* label, int* current_item, CONST char* CONST* items, int items_count, int height_in_items)
 {
     return ImGui::Combo(label, current_item, items, items_count, height_in_items);
 }
@@ -792,26 +832,6 @@ CIMGUI_API bool igCombo3(CONST char* label, int* current_item, bool(*items_gette
     return ImGui::Combo(label, current_item, items_getter, data, items_count, height_in_items);
 }
 
-CIMGUI_API bool igColorButton(CONST ImVec4 col, bool small_height, bool outline_border)
-{
-    return ImGui::ColorButton(col, small_height, outline_border);
-}
-
-CIMGUI_API bool igColorEdit3(CONST char* label, float col[3])
-{
-    return ImGui::ColorEdit3(label, col);
-}
-
-CIMGUI_API bool igColorEdit4(CONST char* label, float col[4], bool show_alpha)
-{
-    return ImGui::ColorEdit4(label, col, show_alpha);
-}
-
-CIMGUI_API void igColorEditMode(ImGuiColorEditMode mode)
-{
-    return ImGui::ColorEditMode(mode);
-}
-
 CIMGUI_API void igPlotLines(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)
 {
     return ImGui::PlotLines(label, values, values_count, values_offset, overlay_text, scale_min, scale_max, graph_size, stride);
@@ -832,7 +852,7 @@ CIMGUI_API void igPlotHistogram2(CONST char* label, float(*values_getter)(void*
     return ImGui::PlotHistogram(label, values_getter, data, values_count, values_offset, overlay_text, scale_min, scale_max, graph_size);
 }
 
-CIMGUI_API void igProgressBar(float fraction, CONST ImVec2* size_arg, const char* overlay)
+CIMGUI_API void igProgressBar(float fraction, CONST ImVec2* size_arg, CONST char* overlay)
 {
     return ImGui::ProgressBar(fraction,*size_arg,overlay);
 }
@@ -845,7 +865,7 @@ CIMGUI_API bool igSliderFloat(CONST char* label, float* v, float v_min, float v_
 
 CIMGUI_API bool igSliderFloat2(CONST char* label, float v[2], float v_min, float v_max, CONST char* display_format, float power)
 {
-    return ImGui::SliderFloat(label, v, v_min, v_max, display_format, power);
+    return ImGui::SliderFloat2(label, v, v_min, v_max, display_format, power);
 }
 
 CIMGUI_API bool igSliderFloat3(CONST char* label, float v[3], float v_min, float v_max, CONST char* display_format, float power)
@@ -893,6 +913,37 @@ CIMGUI_API bool igVSliderInt(CONST char* label, CONST ImVec2 size, int* v, int v
     return ImGui::VSliderInt(label, size, v, v_min, v_max, display_format);
 }
 
+// Widgets: Color Editor/Picker (tip: the ColorEdit* functions have a little colored preview square that can be left-clicked to open a picker, and right-clicked to open an option menu.)
+CIMGUI_API bool igColorEdit3(CONST char* label, float col[3], ImGuiColorEditFlags flags)
+{
+    return ImGui::ColorEdit3(label, col, flags);
+}
+
+CIMGUI_API bool igColorEdit4(CONST char* label, float col[4], ImGuiColorEditFlags flags)
+{
+    return ImGui::ColorEdit4(label, col, flags);
+}
+
+CIMGUI_API bool igColorPicker3(CONST char* label, float col[3], ImGuiColorEditFlags flags)
+{
+    return ImGui::ColorPicker3(label, col, flags);
+}
+
+CIMGUI_API bool igColorPicker4(CONST char* label, float col[4], ImGuiColorEditFlags flags, CONST float* ref_col)
+{
+    return ImGui::ColorPicker4(label, col, flags, ref_col);
+}
+
+CIMGUI_API bool igColorButton(CONST char* desc_id, CONST ImVec4 col, ImGuiColorEditFlags flags, CONST ImVec2 size)
+{
+    return ImGui::ColorButton(desc_id, col, flags, size);
+}
+
+CIMGUI_API void igSetColorEditOptions(ImGuiColorEditFlags flags)
+{
+    return ImGui::SetColorEditOptions(flags);
+}
+
 // Widgets: Drags (tip: ctrl+click on a drag box to input text)
 CIMGUI_API bool igDragFloat(CONST char* label, float* v, float v_speed, float v_min, float v_max, CONST char* display_format, float power)
 {
@@ -997,9 +1048,9 @@ CIMGUI_API bool igInputInt4(CONST char* label, int v[4], ImGuiInputTextFlags ext
 
 
 // Widgets: Trees
-CIMGUI_API bool igTreeNode(CONST char* str_label_id)
+CIMGUI_API bool igTreeNode(CONST char* label)
 {
-    return ImGui::TreeNode(str_label_id);
+    return ImGui::TreeNode(label);
 }
 
 CIMGUI_API bool igTreeNodeStr(CONST char* str_id, CONST char* fmt, ...)
@@ -1032,6 +1083,41 @@ CIMGUI_API bool igTreeNodePtrV(CONST void* ptr_id, CONST char* fmt, va_list args
     return ImGui::TreeNodeV(ptr_id, fmt, args);
 }
 
+CIMGUI_API bool igTreeNodeEx(CONST char* label, ImGuiTreeNodeFlags flags)
+{
+    return ImGui::TreeNodeEx(label, flags);
+}
+
+CIMGUI_API bool igTreeNodeExStr(CONST char* str_id, ImGuiTreeNodeFlags flags, CONST char* fmt, ...)
+{
+    va_list args;
+    va_start(args, fmt);
+    bool res = ImGui::TreeNodeExV(str_id, flags, fmt, args);
+    va_end(args);
+
+    return res;
+}
+
+CIMGUI_API bool igTreeNodeExPtr(CONST void* ptr_id, ImGuiTreeNodeFlags flags, CONST char* fmt, ...)
+{
+    va_list args;
+    va_start(args, fmt);
+    bool res = ImGui::TreeNodeExV(ptr_id, flags, fmt, args);
+    va_end(args);
+
+    return res;
+}
+
+CIMGUI_API bool igTreeNodeExV(CONST char* str_id, ImGuiTreeNodeFlags flags, CONST char* fmt, va_list args)
+{
+    return ImGui::TreeNodeExV(str_id,flags,fmt,args);
+}
+
+CIMGUI_API bool igTreeNodeExVPtr(CONST void* ptr_id, ImGuiTreeNodeFlags flags, CONST char* fmt, va_list args)
+{
+    return ImGui::TreeNodeExV(ptr_id,flags,fmt,args);
+}
+
 CIMGUI_API void igTreePushStr(CONST char* str_id)
 {
     return ImGui::TreePush(str_id);
@@ -1047,9 +1133,29 @@ CIMGUI_API void igTreePop()
     return ImGui::TreePop();
 }
 
-CIMGUI_API void igSetNextTreeNodeOpened(bool opened, ImGuiSetCond cond)
+CIMGUI_API void igTreeAdvanceToLabelPos()
 {
-    return ImGui::SetNextTreeNodeOpened(opened, cond);
+    return ImGui::TreeAdvanceToLabelPos();
+}
+
+CIMGUI_API float igGetTreeNodeToLabelSpacing()
+{
+    return ImGui::GetTreeNodeToLabelSpacing();
+}
+
+CIMGUI_API void igSetNextTreeNodeOpen(bool opened, ImGuiCond cond)
+{
+    return ImGui::SetNextTreeNodeOpen(opened, cond);
+}
+
+CIMGUI_API bool igCollapsingHeader(CONST char* label, ImGuiTreeNodeFlags flags)
+{
+    return ImGui::CollapsingHeader(label, flags);
+}
+
+CIMGUI_API bool igCollapsingHeaderEx(CONST char* label, bool* p_open, ImGuiTreeNodeFlags flags)
+{
+    return ImGui::CollapsingHeader(label,p_open,flags);
 }
 
 // Widgets: Selectable / Lists
@@ -1063,7 +1169,7 @@ CIMGUI_API bool igSelectableEx(CONST char* label, bool* p_selected, ImGuiSelecta
     return ImGui::Selectable(label, p_selected, flags, size);
 }
 
-CIMGUI_API bool igListBox(CONST char* label, int* current_item, CONST char** items, int items_count, int height_in_items)
+CIMGUI_API bool igListBox(CONST char* label, int* current_item, CONST char* CONST* items, int items_count, int height_in_items)
 {
     return ImGui::ListBox(label, current_item, items, items_count, height_in_items);
 }
@@ -1149,16 +1255,6 @@ CIMGUI_API void igValueFloat(CONST char* prefix, float v, CONST char* float_form
     ImGui::Value(prefix,v,float_format);
 }
 
-CIMGUI_API void igValueColor(CONST char* prefix, CONST ImVec4 v)
-{
-    ImGui::ValueColor(prefix,v);
-}
-
-CIMGUI_API void igValueColor2(CONST char* prefix, unsigned int v)
-{
-    ImGui::ValueColor(prefix,v);
-}
-
 // Logging: all text output from interface is redirected to tty/file/clipboard. Tree nodes are automatically opened.
 CIMGUI_API void igLogToTTY(int max_depth)
 {
@@ -1190,21 +1286,31 @@ CIMGUI_API void igLogText(CONST char* fmt, ...)
     char buffer[256];
     va_list args;
     va_start(args, fmt);
-    snprintf(buffer, 256, fmt, args);
+    vsnprintf(buffer, 256, fmt, args);
     va_end(args);
 
     ImGui::LogText("%s",buffer);
 }
 
-// Utilities
-CIMGUI_API bool igIsItemHovered()
+CIMGUI_API void igPushClipRect(CONST struct ImVec2 clip_rect_min, CONST struct ImVec2 clip_rect_max, bool intersect_with_current_clip_rect)
 {
-    return ImGui::IsItemHovered();
+    return ImGui::PushClipRect(clip_rect_min, clip_rect_max, intersect_with_current_clip_rect);
 }
 
-CIMGUI_API bool igIsItemHoveredRect()
+CIMGUI_API void igPopClipRect()
 {
-    return ImGui::IsItemHoveredRect();
+    return ImGui::PopClipRect();
+}
+
+CIMGUI_API void igStyleColorsClassic(struct ImGuiStyle * dst)
+{
+	ImGui::StyleColorsClassic(dst);
+}
+
+// Utilities
+CIMGUI_API bool igIsItemHovered(ImGuiHoveredFlags flags)
+{
+    return ImGui::IsItemHovered(flags);
 }
 
 CIMGUI_API bool igIsItemActive()
@@ -1212,6 +1318,11 @@ CIMGUI_API bool igIsItemActive()
     return ImGui::IsItemActive();
 }
 
+CIMGUI_API bool igIsItemClicked(int mouse_button)
+{
+    return ImGui::IsItemClicked(mouse_button);
+}
+
 CIMGUI_API bool igIsItemVisible()
 {
     return ImGui::IsItemVisible();
@@ -1247,16 +1358,16 @@ CIMGUI_API void igSetItemAllowOverlap()
     ImGui::SetItemAllowOverlap();
 }
 
-CIMGUI_API bool igIsWindowHovered()
-{
-    return ImGui::IsWindowHovered();
-}
-
 CIMGUI_API bool igIsWindowFocused()
 {
     return ImGui::IsWindowFocused();
 }
 
+CIMGUI_API bool igIsWindowHovered(ImGuiHoveredFlags)
+{
+    return ImGui::IsWindowHovered();
+}
+
 CIMGUI_API bool igIsRootWindowFocused()
 {
     return ImGui::IsRootWindowFocused();
@@ -1267,29 +1378,49 @@ CIMGUI_API bool igIsRootWindowOrAnyChildFocused()
     return ImGui::IsRootWindowOrAnyChildFocused();
 }
 
+CIMGUI_API bool igIsRootWindowOrAnyChildHovered(ImGuiHoveredFlags flags)
+{
+    return ImGui::IsRootWindowOrAnyChildHovered(flags);
+}
+
+CIMGUI_API bool igIsAnyWindowHovered()
+{
+    return ImGui::IsAnyWindowHovered();
+}
+
 CIMGUI_API bool igIsRectVisible(CONST ImVec2 item_size)
 {
     return ImGui::IsRectVisible(item_size);
 }
 
-CIMGUI_API int igGetKeyIndex(ImGuiKey key)
+CIMGUI_API bool igIsRectVisible2(CONST struct ImVec2* rect_min, CONST struct ImVec2* rect_max)
 {
-    return ImGui::GetKeyIndex(key);
+    return ImGui::IsRectVisible(*rect_min, *rect_max);
 }
 
-CIMGUI_API bool igIsKeyDown(int key_index)
+CIMGUI_API int igGetKeyIndex(ImGuiKey imgui_key)
 {
-    return ImGui::IsKeyDown(key_index);
+    return ImGui::GetKeyIndex(imgui_key);
 }
 
-CIMGUI_API bool igIsKeyPressed(int key_index, bool repeat)
+CIMGUI_API bool igIsKeyDown(int user_key_index)
 {
-    return ImGui::IsKeyPressed(key_index,repeat);
+    return ImGui::IsKeyDown(user_key_index);
 }
 
-CIMGUI_API bool igIsKeyReleased(int key_index)
+CIMGUI_API bool igIsKeyPressed(int user_key_index, bool repeat)
 {
-    return ImGui::IsKeyReleased(key_index);
+    return ImGui::IsKeyPressed(user_key_index,repeat);
+}
+
+CIMGUI_API bool igIsKeyReleased(int user_key_index)
+{
+    return ImGui::IsKeyReleased(user_key_index);
+}
+
+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)
@@ -1312,14 +1443,9 @@ CIMGUI_API bool igIsMouseReleased(int button)
     return ImGui::IsMouseReleased(button);
 }
 
-CIMGUI_API bool igIsMouseHoveringWindow()
+CIMGUI_API bool igIsMouseDragging(int button, float lock_threshold)
 {
-    return ImGui::IsMouseHoveringWindow();
-}
-
-CIMGUI_API bool igIsMouseHoveringAnyWindow()
-{
-    return ImGui::IsMouseHoveringAnyWindow();
+    return ImGui::IsMouseDragging(button,lock_threshold);
 }
 
 CIMGUI_API bool igIsMouseHoveringRect(CONST ImVec2 r_min, CONST ImVec2 r_max, bool clip)
@@ -1327,13 +1453,9 @@ CIMGUI_API bool igIsMouseHoveringRect(CONST ImVec2 r_min, CONST ImVec2 r_max, bo
     return ImGui::IsMouseHoveringRect(r_min,r_max,clip);
 }
 
-CIMGUI_API bool igIsMouseDragging(int button, float lock_threshold)
+CIMGUI_API bool igIsMousePosValid(CONST struct ImVec2 * mouse_pos)
 {
-    return ImGui::IsMouseDragging(button,lock_threshold);
-}
-CIMGUI_API bool igIsPosHoveringAnyWindow(CONST ImVec2 pos)
-{
-    return ImGui::IsPosHoveringAnyWindow(pos);
+	return ImGui::IsMousePosValid(mouse_pos);
 }
 
 CIMGUI_API void igGetMousePos(ImVec2* pOut)
@@ -1406,9 +1528,9 @@ CIMGUI_API int igGetFrameCount()
     return ImGui::GetFrameCount();
 }
 
-CIMGUI_API CONST char* igGetStyleColName(ImGuiCol idx)
+CIMGUI_API CONST char* igGetStyleColorName(ImGuiCol idx)
 {
-    return ImGui::GetStyleColName(idx);
+    return ImGui::GetStyleColorName(idx);
 }
 
 CIMGUI_API void igCalcItemRectClosestPoint(ImVec2* pOut, CONST ImVec2 pos, bool on_edge, float outward)
@@ -1461,19 +1583,24 @@ CIMGUI_API CONST char* igGetVersion()
     return ImGui::GetVersion();
 }
 
-CIMGUI_API void* igGetInternalState()
+CIMGUI_API ImGuiContext* igCreateContext(void* (*malloc_fn)(size_t), void (*free_fn)(void*))
 {
-    return ImGui::GetInternalState();
+    return ImGui::CreateContext(malloc_fn,free_fn);
 }
 
-CIMGUI_API size_t igGetInternalStateSize()
+CIMGUI_API void igDestroyContext(ImGuiContext* ctx)
 {
-    return ImGui::GetInternalStateSize();
+    return ImGui::DestroyContext(ctx);
 }
 
-CIMGUI_API void igSetInternalState(void* state, bool construct)
+CIMGUI_API ImGuiContext* igGetCurrentContext()
 {
-    ImGui::SetInternalState(state, construct);
+    return ImGui::GetCurrentContext();
+}
+
+CIMGUI_API void igSetCurrentContext(ImGuiContext* ctx)
+{
+    return ImGui::SetCurrentContext(ctx);
 }
 
 CIMGUI_API void ImGuiIO_AddInputCharacter(unsigned short c)
@@ -1489,4 +1616,204 @@ CIMGUI_API void ImGuiIO_AddInputCharactersUTF8(CONST char* utf8_chars)
 CIMGUI_API void ImGuiIO_ClearInputCharacters()
 {
     return ImGui::GetIO().ClearInputCharacters();
-}
+}
+
+CIMGUI_API struct ImGuiTextFilter* ImGuiTextFilter_Create(const char* default_filter)
+{
+    ImGuiTextFilter* filter = (ImGuiTextFilter*)ImGui::MemAlloc(sizeof(ImGuiTextFilter));
+    IM_PLACEMENT_NEW(filter) ImGuiTextFilter(default_filter);
+    return filter;
+}
+
+CIMGUI_API void ImGuiTextFilter_Destroy(struct ImGuiTextFilter* filter)
+{
+    filter->~ImGuiTextFilter();
+    ImGui::MemFree(filter);
+}
+
+CIMGUI_API void ImGuiTextFilter_Clear(struct ImGuiTextFilter* filter)
+{
+    filter->Clear();
+}
+
+CIMGUI_API bool ImGuiTextFilter_Draw(struct ImGuiTextFilter* filter, const char* label, float width)
+{
+    return filter->Draw(label, width);
+}
+
+CIMGUI_API bool ImGuiTextFilter_PassFilter(const struct ImGuiTextFilter* filter, const char* text, const char* text_end)
+{
+    return filter->PassFilter(text, text_end);
+}
+
+CIMGUI_API bool ImGuiTextFilter_IsActive(const struct ImGuiTextFilter* filter)
+{
+    return filter->IsActive();
+}
+
+CIMGUI_API void ImGuiTextFilter_Build(struct ImGuiTextFilter* filter)
+{
+    filter->Build();
+}
+
+CIMGUI_API const char* ImGuiTextFilter_GetInputBuf(struct ImGuiTextFilter* filter)
+{
+    return filter->InputBuf;
+}
+
+CIMGUI_API struct ImGuiTextBuffer* ImGuiTextBuffer_Create()
+{
+    ImGuiTextBuffer* buffer = (ImGuiTextBuffer*)ImGui::MemAlloc(sizeof(ImGuiTextBuffer));
+    IM_PLACEMENT_NEW(buffer) ImGuiTextBuffer();
+    return buffer;
+}
+
+CIMGUI_API void ImGuiTextBuffer_Destroy(struct ImGuiTextBuffer* buffer)
+{
+    buffer->~ImGuiTextBuffer();
+    ImGui::MemFree(buffer);
+}
+
+CIMGUI_API char ImGuiTextBuffer_index(struct ImGuiTextBuffer* buffer, int i)
+{
+    return (*buffer)[i];
+}
+
+CIMGUI_API const char* ImGuiTextBuffer_begin(const struct ImGuiTextBuffer* buffer)
+{
+    return buffer->begin();
+}
+
+CIMGUI_API const char* ImGuiTextBuffer_end(const struct ImGuiTextBuffer* buffer)
+{
+    return buffer->end();
+}
+
+CIMGUI_API int ImGuiTextBuffer_size(const struct ImGuiTextBuffer* buffer)
+{
+    return buffer->size();
+}
+
+CIMGUI_API bool ImGuiTextBuffer_empty(struct ImGuiTextBuffer* buffer)
+{
+    return buffer->empty();
+}
+
+CIMGUI_API void ImGuiTextBuffer_clear(struct ImGuiTextBuffer* buffer)
+{
+    buffer->clear();
+}
+
+CIMGUI_API const char* ImGuiTextBuffer_c_str(const struct ImGuiTextBuffer* buffer)
+{
+    return buffer->c_str();
+}
+
+CIMGUI_API void ImGuiTextBuffer_append(struct ImGuiTextBuffer* buffer, const char* fmt, ...)
+{
+    va_list args;
+    va_start(args, fmt);
+    buffer->appendv(fmt, args);
+    va_end(args);
+}
+
+CIMGUI_API void ImGuiTextBuffer_appendv(struct ImGuiTextBuffer* buffer, const char* fmt, va_list args)
+{
+    buffer->appendv(fmt, args);
+}
+
+CIMGUI_API struct ImGuiStorage* ImGuiStorage_Create() {
+    ImGuiStorage* storage = (ImGuiStorage*)ImGui::MemAlloc(sizeof(ImGuiStorage));
+    IM_PLACEMENT_NEW(storage) ImGuiStorage();
+    return storage;
+}
+
+CIMGUI_API void ImGuiStorage_Destroy(struct ImGuiStorage* storage) {
+    storage->~ImGuiStorage();
+    ImGui::MemFree(storage);
+}
+
+CIMGUI_API void ImGuiStorage_Clear(struct ImGuiStorage* storage)
+{
+    storage->Clear();
+}
+
+CIMGUI_API int ImGuiStorage_GetInt(struct ImGuiStorage* storage, ImGuiID key, int default_val)
+{
+    return storage->GetInt(key, default_val);
+}
+
+CIMGUI_API void ImGuiStorage_SetInt(struct ImGuiStorage* storage, ImGuiID key, int val)
+{
+    storage->SetInt(key, val);
+}
+
+CIMGUI_API bool ImGuiStorage_GetBool(struct ImGuiStorage* storage, ImGuiID key, bool default_val)
+{
+    return storage->GetBool(key, default_val);
+}
+
+CIMGUI_API void ImGuiStorage_SetBool(struct ImGuiStorage* storage, ImGuiID key, bool val)
+{
+    storage->SetBool(key, val);
+}
+
+CIMGUI_API float ImGuiStorage_GetFloat(struct ImGuiStorage* storage, ImGuiID key, float default_val)
+{
+    return storage->GetFloat(key, default_val);
+}
+
+CIMGUI_API void ImGuiStorage_SetFloat(struct ImGuiStorage* storage, ImGuiID key, float val)
+{
+    storage->SetFloat(key, val);
+}
+
+CIMGUI_API void* ImGuiStorage_GetVoidPtr(struct ImGuiStorage* storage, ImGuiID key)
+{
+    return storage->GetVoidPtr(key);
+}
+
+CIMGUI_API void ImGuiStorage_SetVoidPtr(struct ImGuiStorage* storage, ImGuiID key, void* val)
+{
+    storage->SetVoidPtr(key, val);
+}
+
+CIMGUI_API int* ImGuiStorage_GetIntRef(struct ImGuiStorage* storage, ImGuiID key, int default_val)
+{
+    return storage->GetIntRef(key, default_val);
+}
+
+CIMGUI_API bool* ImGuiStorage_GetBoolRef(struct ImGuiStorage* storage, ImGuiID key, bool default_val)
+{
+    return storage->GetBoolRef(key, default_val);
+}
+
+CIMGUI_API float* ImGuiStorage_GetFloatRef(struct ImGuiStorage* storage, ImGuiID key, float default_val)
+{
+    return storage->GetFloatRef(key, default_val);
+}
+
+CIMGUI_API void** ImGuiStorage_GetVoidPtrRef(struct ImGuiStorage* storage, ImGuiID key, void* default_val)
+{
+    return storage->GetVoidPtrRef(key, default_val);
+}
+
+CIMGUI_API void ImGuiStorage_SetAllInt(struct ImGuiStorage* storage, int val)
+{
+    storage->SetAllInt(val);
+}
+
+CIMGUI_API void ImGuiTextEditCallbackData_DeleteChars(struct ImGuiTextEditCallbackData* data, int pos, int bytes_count)
+{
+    data->DeleteChars(pos, bytes_count);
+}
+
+CIMGUI_API void ImGuiTextEditCallbackData_InsertChars(struct ImGuiTextEditCallbackData* data, int pos, const char* text, const char* text_end)
+{
+    data->InsertChars(pos, text, text_end);
+}
+
+CIMGUI_API bool ImGuiTextEditCallbackData_HasSelection(struct ImGuiTextEditCallbackData* data)
+{
+    return data->HasSelection();
+}

cimgui/cimgui.sln

@@ -8,13 +8,19 @@ EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
+		Debug|x64 = Debug|x64
 		Release|Win32 = Release|Win32
+		Release|x64 = Release|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{EDE48926-0595-4488-B1A0-32CA71397271}.Debug|Win32.ActiveCfg = Debug|Win32
 		{EDE48926-0595-4488-B1A0-32CA71397271}.Debug|Win32.Build.0 = Debug|Win32
+		{EDE48926-0595-4488-B1A0-32CA71397271}.Debug|x64.ActiveCfg = Debug|x64
+		{EDE48926-0595-4488-B1A0-32CA71397271}.Debug|x64.Build.0 = Debug|x64
 		{EDE48926-0595-4488-B1A0-32CA71397271}.Release|Win32.ActiveCfg = Release|Win32
 		{EDE48926-0595-4488-B1A0-32CA71397271}.Release|Win32.Build.0 = Release|Win32
+		{EDE48926-0595-4488-B1A0-32CA71397271}.Release|x64.ActiveCfg = Release|x64
+		{EDE48926-0595-4488-B1A0-32CA71397271}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

cimgui/cimgui.vcxproj

@@ -5,10 +5,18 @@
       <Configuration>Debug</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Release|Win32">
       <Configuration>Release</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{EDE48926-0595-4488-B1A0-32CA71397271}</ProjectGuid>
@@ -22,6 +30,12 @@
     <PlatformToolset>v140</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v140</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
@@ -29,22 +43,41 @@
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v140</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <LinkIncremental>true</LinkIncremental>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>false</LinkIncremental>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <PrecompiledHeader>
@@ -58,6 +91,19 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
     </Link>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;CIMGUI_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
       <WarningLevel>Level3</WarningLevel>
@@ -67,6 +113,27 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;CIMGUI_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <WholeProgramOptimization>true</WholeProgramOptimization>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;CIMGUI_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <WholeProgramOptimization>true</WholeProgramOptimization>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -82,6 +149,7 @@
     <ClCompile Include="cimgui.cpp" />
     <ClCompile Include="drawList.cpp" />
     <ClCompile Include="fontAtlas.cpp" />
+    <ClCompile Include="listClipper.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\imgui\imgui_internal.h" />

cimgui/cimgui.vcxproj.filters

@@ -33,6 +33,9 @@
     <ClCompile Include="..\imgui\imgui_demo.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="listClipper.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="cimgui.h">

cimgui/drawList.cpp

@@ -2,257 +2,287 @@
 #include "../imgui/imgui.h"
 #include "cimgui.h"
 
+CIMGUI_API void ImDrawData_DeIndexAllBuffers(ImDrawData* drawData)
+{
+    return drawData->DeIndexAllBuffers();
+}
+
+CIMGUI_API void ImDrawData_ScaleClipRects(ImDrawData* drawData, const struct ImVec2 sc)
+{
+    return drawData->ScaleClipRects(sc);
+}
+
 CIMGUI_API int ImDrawList_GetVertexBufferSize(ImDrawList* list)
 {
-	return list->VtxBuffer.size();
+    return list->VtxBuffer.size();
 }
 
 CIMGUI_API ImDrawVert* ImDrawList_GetVertexPtr(ImDrawList* list, int n)
 {
-	return &list->VtxBuffer[n];
+    return &list->VtxBuffer[n];
 }
 
 CIMGUI_API int ImDrawList_GetIndexBufferSize(ImDrawList* list)
 {
-	return list->IdxBuffer.size();
+    return list->IdxBuffer.size();
 }
 
 CIMGUI_API ImDrawIdx* ImDrawList_GetIndexPtr(ImDrawList* list, int n)
 {
-	return &list->IdxBuffer[n];
+    return &list->IdxBuffer[n];
 }
 
 CIMGUI_API int ImDrawList_GetCmdSize(ImDrawList* list)
 {
-	return list->CmdBuffer.size();
+    return list->CmdBuffer.size();
 }
 
 CIMGUI_API ImDrawCmd* ImDrawList_GetCmdPtr(ImDrawList* list, int n)
 {
-	return &list->CmdBuffer[n];
-}
-
-CIMGUI_API void ImDrawData_DeIndexAllBuffers(ImDrawData* drawData)
-{
-	return drawData->DeIndexAllBuffers();
+    return &list->CmdBuffer[n];
 }
 
 CIMGUI_API void ImDrawList_Clear(ImDrawList* list)
 {
-	return list->Clear();
+    return list->Clear();
 }
 
 CIMGUI_API void ImDrawList_ClearFreeMemory(ImDrawList* list)
 {
-	return list->ClearFreeMemory();
+    return list->ClearFreeMemory();
 }
 
-CIMGUI_API void ImDrawList_PushClipRect(ImDrawList* list, CONST struct ImVec4 clip_rect)
+CIMGUI_API void ImDrawList_PushClipRect(ImDrawList* list, struct ImVec2 clip_rect_min, struct ImVec2 clip_rect_max, bool intersect_with_current_clip_rect)
 {
-	return list->PushClipRect(clip_rect);
+    return list->PushClipRect(clip_rect_min,clip_rect_max,intersect_with_current_clip_rect);
 }
 
 CIMGUI_API void ImDrawList_PushClipRectFullScreen(ImDrawList* list)
 {
-	return list->PushClipRectFullScreen();
+    return list->PushClipRectFullScreen();
 }
 
 CIMGUI_API void ImDrawList_PopClipRect(ImDrawList* list)
 {
-	return list->PopClipRect();
+    return list->PopClipRect();
 }
 
 CIMGUI_API void ImDrawList_PushTextureID(ImDrawList* list, CONST ImTextureID texture_id)
 {
-	return list->PushTextureID(texture_id);
+    return list->PushTextureID(texture_id);
 }
 
 CIMGUI_API void ImDrawList_PopTextureID(ImDrawList* list)
 {
-	return list->PopTextureID();
+    return list->PopTextureID();
+}
+
+CIMGUI_API void ImDrawList_GetClipRectMin(ImVec2* pOut, ImDrawList* list)
+{
+    *pOut = list->GetClipRectMin();
+}
+
+CIMGUI_API void ImDrawList_GetClipRectMax(ImVec2* pOut, ImDrawList* list)
+{
+    *pOut = list->GetClipRectMax();
 }
 
 CIMGUI_API void ImDrawList_AddLine(ImDrawList* list, CONST struct ImVec2 a, CONST struct ImVec2 b, ImU32 col, float thickness)
 {
-	return list->AddLine(a, b, col, thickness);
+    return list->AddLine(a, b, col, thickness);
 }
 
-CIMGUI_API void ImDrawList_AddRect(ImDrawList* list, CONST struct ImVec2 a, CONST struct ImVec2 b, ImU32 col, float rounding, int rounding_corners, float thickness)
+CIMGUI_API void ImDrawList_AddRect(ImDrawList* list, CONST struct ImVec2 a, CONST struct ImVec2 b, ImU32 col, float rounding, int rounding_corners_flags, float thickness)
 {
-	return list->AddRect(a, b, col, rounding, rounding_corners, thickness);
+    return list->AddRect(a, b, col, rounding, rounding_corners_flags, thickness);
 }
 
-CIMGUI_API void ImDrawList_AddRectFilled(ImDrawList* list, CONST struct ImVec2 a, CONST struct ImVec2 b, ImU32 col, float rounding, int rounding_corners)
+CIMGUI_API void ImDrawList_AddRectFilled(ImDrawList* list, CONST struct ImVec2 a, CONST struct ImVec2 b, ImU32 col, float rounding, int rounding_corners_flags)
 {
-	return list->AddRectFilled(a, b, col, rounding, rounding_corners);
+    return list->AddRectFilled(a, b, col, rounding, rounding_corners_flags);
 }
 
 CIMGUI_API void ImDrawList_AddRectFilledMultiColor(ImDrawList* list, CONST struct ImVec2 a, CONST struct ImVec2 b, ImU32 col_upr_left, ImU32 col_upr_right, ImU32 col_bot_right, ImU32 col_bot_left)
 {
-	return list->AddRectFilledMultiColor(a, b, col_upr_left, col_upr_right, col_bot_right, col_bot_left);
+    return list->AddRectFilledMultiColor(a, b, col_upr_left, col_upr_right, col_bot_right, col_bot_left);
+}
+
+CIMGUI_API void ImDrawList_AddQuad(ImDrawList* list, CONST struct ImVec2 a, CONST struct ImVec2 b, CONST struct ImVec2 c, CONST struct ImVec2 d, ImU32 col, float thickness)
+{
+    return list->AddQuad(a, b, c, d, col, thickness);
+}
+
+CIMGUI_API void ImDrawList_AddQuadFilled(ImDrawList* list, CONST struct ImVec2 a, CONST struct ImVec2 b, CONST struct ImVec2 c, CONST struct ImVec2 d, ImU32 col)
+{
+    return list->AddQuadFilled(a, b, c, d, col);
 }
 
 CIMGUI_API void ImDrawList_AddTriangle(ImDrawList* list, CONST struct ImVec2 a, CONST struct ImVec2 b, CONST struct ImVec2 c, ImU32 col, float thickness)
 {
-	return list->AddTriangle(a,b,c,col,thickness);
+    return list->AddTriangle(a,b,c,col,thickness);
 }
 
 CIMGUI_API void ImDrawList_AddTriangleFilled(ImDrawList* list, CONST struct ImVec2 a, CONST struct ImVec2 b, CONST struct ImVec2 c, ImU32 col)
 {
-	return list->AddTriangleFilled(a, b, c, col);
+    return list->AddTriangleFilled(a, b, c, col);
 }
 
 CIMGUI_API void ImDrawList_AddCircle(ImDrawList* list, CONST struct ImVec2 centre, float radius, ImU32 col, int num_segments, float thickness)
 {
-	return list->AddCircle(centre, radius, col, num_segments, thickness);
+    return list->AddCircle(centre, radius, col, num_segments, thickness);
 }
 
 CIMGUI_API void ImDrawList_AddCircleFilled(ImDrawList* list, CONST struct ImVec2 centre, float radius, ImU32 col, int num_segments)
 {
-	return list->AddCircleFilled(centre, radius, col, num_segments);
+    return list->AddCircleFilled(centre, radius, col, num_segments);
 }
 
 CIMGUI_API void ImDrawList_AddText(ImDrawList* list, CONST struct ImVec2 pos, ImU32 col, CONST char* text_begin, CONST char* text_end)
 {
-	return list->AddText(pos, col, text_begin, text_end);
+    return list->AddText(pos, col, text_begin, text_end);
 }
 
 CIMGUI_API void ImDrawList_AddTextExt(ImDrawList* list, CONST ImFont* font, float font_size, CONST struct ImVec2 pos, ImU32 col, CONST char* text_begin, CONST char* text_end, float wrap_width, CONST ImVec4* cpu_fine_clip_rect)
 {
-	return list->AddText(font, font_size, pos, col, text_begin, text_end, wrap_width, cpu_fine_clip_rect);
+    return list->AddText(font, font_size, pos, col, text_begin, text_end, wrap_width, cpu_fine_clip_rect);
 }
 
-CIMGUI_API void ImDrawList_AddImage(ImDrawList* list, ImTextureID user_texture_id, CONST struct ImVec2 a, CONST struct ImVec2 b, CONST struct ImVec2 uv0, CONST struct ImVec2 uv1, ImU32 col)
+CIMGUI_API void ImDrawList_AddImage(ImDrawList* list, ImTextureID user_texture_id, CONST struct ImVec2 a, CONST struct ImVec2 b, CONST struct ImVec2 uv_a, CONST struct ImVec2 uv_b, ImU32 col)
 {
-	return list->AddImage(user_texture_id, a, b, uv0, uv1, col);
+    return list->AddImage(user_texture_id, a, b, uv_a, uv_b, col);
+}
+
+CIMGUI_API void ImDrawList_AddImageQuad(struct ImDrawList* list, ImTextureID user_texture_id, CONST struct 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)
+{
+    return list->AddImageQuad(user_texture_id, a, b, c, d, uv_a, uv_b, uv_c, uv_d, col);
 }
 
 CIMGUI_API void ImDrawList_AddPolyline(ImDrawList* list, CONST ImVec2* points, CONST int num_points, ImU32 col, bool closed, float thickness, bool anti_aliased)
 {
-	return list->AddPolyline(points, num_points, col, closed, thickness, anti_aliased);
+    return list->AddPolyline(points, num_points, col, closed, thickness, anti_aliased);
 }
 
 CIMGUI_API void ImDrawList_AddConvexPolyFilled(ImDrawList* list, CONST ImVec2* points, CONST int num_points, ImU32 col, bool anti_aliased)
 {
-	return list->AddConvexPolyFilled(points, num_points, col, anti_aliased);
+    return list->AddConvexPolyFilled(points, num_points, col, anti_aliased);
 }
 
 CIMGUI_API void ImDrawList_AddBezierCurve(ImDrawList* list, CONST struct ImVec2 pos0, CONST struct ImVec2 cp0, CONST struct ImVec2 cp1, CONST struct ImVec2 pos1, ImU32 col, float thickness, int num_segments)
 {
-	return list->AddBezierCurve(pos0, cp0, cp1, pos1, col, thickness, num_segments);
+    return list->AddBezierCurve(pos0, cp0, cp1, pos1, col, thickness, num_segments);
 }
 
 CIMGUI_API void ImDrawList_PathClear(ImDrawList* list)
 {
-	return list->PathClear();
+    return list->PathClear();
 }
 
 CIMGUI_API void ImDrawList_PathLineTo(ImDrawList* list, CONST struct ImVec2 pos)
 {
-	return list->PathLineTo(pos);
+    return list->PathLineTo(pos);
 }
 
 CIMGUI_API void ImDrawList_PathLineToMergeDuplicate(ImDrawList* list, CONST struct ImVec2 pos)
 {
-	return list->PathLineToMergeDuplicate(pos);
+    return list->PathLineToMergeDuplicate(pos);
 }
 
-CIMGUI_API void ImDrawList_PathFill(ImDrawList* list, ImU32 col)
+CIMGUI_API void ImDrawList_PathFillConvex(ImDrawList* list, ImU32 col)
 {
-	return list->PathFill(col);
+    return list->PathFillConvex(col);
 }
 
 CIMGUI_API void ImDrawList_PathStroke(ImDrawList* list, ImU32 col, bool closed, float thickness)
 {
-	return list->PathStroke(col, closed, thickness);
+    return list->PathStroke(col, closed, thickness);
 }
 
 CIMGUI_API void ImDrawList_PathArcTo(ImDrawList* list, CONST struct ImVec2 centre, float radius, float a_min, float a_max, int num_segments)
 {
-	return list->PathArcTo(centre, radius, a_min, a_max, num_segments);
+    return list->PathArcTo(centre, radius, a_min, a_max, num_segments);
 }
 
 CIMGUI_API void ImDrawList_PathArcToFast(ImDrawList* list, CONST struct ImVec2 centre, float radius, int a_min_of_12, int a_max_of_12)
 {
-	return list->PathArcToFast(centre, radius, a_min_of_12, a_max_of_12);
+    return list->PathArcToFast(centre, radius, a_min_of_12, a_max_of_12);
 }
 
 CIMGUI_API void ImDrawList_PathBezierCurveTo(ImDrawList* list, CONST struct ImVec2 p1, CONST struct ImVec2 p2, CONST struct ImVec2 p3, int num_segments)
 {
-	return list->PathBezierCurveTo(p1, p2, p3, num_segments);
+    return list->PathBezierCurveTo(p1, p2, p3, num_segments);
 }
 
-CIMGUI_API void ImDrawList_PathRect(ImDrawList* list, CONST struct ImVec2 rect_min, CONST struct ImVec2 rect_max, float rounding, int rounding_corners)
+CIMGUI_API void ImDrawList_PathRect(ImDrawList* list, CONST struct ImVec2 rect_min, CONST struct ImVec2 rect_max, float rounding, int rounding_corners_flags)
 {
-	return list->PathRect(rect_min, rect_max, rounding, rounding_corners);
+    return list->PathRect(rect_min, rect_max, rounding, rounding_corners_flags);
 }
 
 CIMGUI_API void ImDrawList_ChannelsSplit(ImDrawList* list, int channels_count)
 {
-	return list->ChannelsSplit(channels_count);
+    return list->ChannelsSplit(channels_count);
 }
 
 CIMGUI_API void ImDrawList_ChannelsMerge(ImDrawList* list)
 {
-	return list->ChannelsMerge();
+    return list->ChannelsMerge();
 }
 
 CIMGUI_API void ImDrawList_ChannelsSetCurrent(ImDrawList* list, int channel_index)
 {
-	return list->ChannelsSetCurrent(channel_index);
+    return list->ChannelsSetCurrent(channel_index);
 }
 
 CIMGUI_API void ImDrawList_AddCallback(ImDrawList* list, ImDrawCallback callback, void* callback_data)
 {
-	return list->AddCallback(callback, callback_data);
+    return list->AddCallback(callback, callback_data);
 }
 
 CIMGUI_API void ImDrawList_AddDrawCmd(ImDrawList* list)
 {
-	return list->AddDrawCmd();
+    return list->AddDrawCmd();
 }
 
 CIMGUI_API void ImDrawList_PrimReserve(ImDrawList* list, int idx_count, int vtx_count)
 {
-	return list->PrimReserve(idx_count, vtx_count);
+    return list->PrimReserve(idx_count, vtx_count);
 }
 
 CIMGUI_API void ImDrawList_PrimRect(ImDrawList* list, CONST struct ImVec2 a, CONST struct ImVec2 b, ImU32 col)
 {
-	return list->PrimRect(a, b, col);
+    return list->PrimRect(a, b, col);
 }
 
 CIMGUI_API void ImDrawList_PrimRectUV(ImDrawList* list, CONST struct ImVec2 a, CONST struct ImVec2 b, CONST struct ImVec2 uv_a, CONST struct ImVec2 uv_b, ImU32 col)
 {
-	return list->PrimRectUV(a, b, uv_a, uv_b, col);
+    return list->PrimRectUV(a, b, uv_a, uv_b, col);
 }
 
 CIMGUI_API void ImDrawList_PrimQuadUV(ImDrawList* list,CONST struct ImVec2 a, CONST struct ImVec2 b, CONST struct ImVec2 c, CONST struct ImVec2 d, CONST struct ImVec2 uv_a, CONST struct ImVec2 uv_b, CONST struct ImVec2 uv_c, CONST struct ImVec2 uv_d, ImU32 col)
 {
-	return list->PrimQuadUV(a,b,c,d,uv_a,uv_b,uv_c,uv_d,col);
+    return list->PrimQuadUV(a,b,c,d,uv_a,uv_b,uv_c,uv_d,col);
 }
 
 CIMGUI_API void ImDrawList_PrimVtx(ImDrawList* list, CONST struct ImVec2 pos, CONST struct ImVec2 uv, ImU32 col)
 {
-	return list->PrimVtx(pos, uv, col);
+    return list->PrimVtx(pos, uv, col);
 }
 
 CIMGUI_API void ImDrawList_PrimWriteVtx(ImDrawList* list, CONST struct ImVec2 pos, CONST struct ImVec2 uv, ImU32 col)
 {
-	return list->PrimWriteVtx(pos, uv, col);
+    return list->PrimWriteVtx(pos, uv, col);
 }
 
 CIMGUI_API void ImDrawList_PrimWriteIdx(ImDrawList* list, ImDrawIdx idx)
 {
-	return list->PrimWriteIdx(idx);
+    return list->PrimWriteIdx(idx);
 }
 
 CIMGUI_API void ImDrawList_UpdateClipRect(ImDrawList* list)
 {
-	return list->UpdateClipRect();
+    return list->UpdateClipRect();
 }
 
 CIMGUI_API void ImDrawList_UpdateTextureID(ImDrawList* list)
 {
-	return list->UpdateTextureID();
+    return list->UpdateTextureID();
 }

cimgui/fontAtlas.cpp

@@ -2,57 +2,322 @@
 #include "../imgui/imgui.h"
 #include "cimgui.h"
 
+CIMGUI_API void ImFontConfig_DefaultConstructor(ImFontConfig* config)
+{
+	*config = ImFontConfig();
+}
+
 CIMGUI_API void ImFontAtlas_GetTexDataAsRGBA32(ImFontAtlas* atlas, unsigned char** out_pixels, int* out_width, int* out_height, int* out_bytes_per_pixel)
 {
-	atlas->GetTexDataAsRGBA32(out_pixels, out_width, out_height, out_bytes_per_pixel);
+    atlas->GetTexDataAsRGBA32(out_pixels, out_width, out_height, out_bytes_per_pixel);
 }
 
 CIMGUI_API void ImFontAtlas_GetTexDataAsAlpha8(ImFontAtlas* atlas, unsigned char** out_pixels, int* out_width, int* out_height, int* out_bytes_per_pixel)
 {
-	atlas->GetTexDataAsAlpha8(out_pixels, out_width, out_height, out_bytes_per_pixel);
+    atlas->GetTexDataAsAlpha8(out_pixels, out_width, out_height, out_bytes_per_pixel);
 }
 
-CIMGUI_API void ImFontAtlas_SetTexID(ImFontAtlas* atlas, void* tex)
+CIMGUI_API void ImFontAtlas_SetTexID(ImFontAtlas* atlas, ImTextureID id)
 {
-	atlas->TexID = tex;
+    atlas->TexID = id;
 }
 
 CIMGUI_API ImFont* ImFontAtlas_AddFont(ImFontAtlas* atlas, CONST ImFontConfig* font_cfg)
 {
-	return atlas->AddFont(font_cfg);
+    return atlas->AddFont(font_cfg);
 }
 
 CIMGUI_API ImFont* ImFontAtlas_AddFontDefault(ImFontAtlas* atlas, CONST ImFontConfig* font_cfg)
 {
-	return atlas->AddFontDefault(font_cfg);
+    return atlas->AddFontDefault(font_cfg);
 }
 
 CIMGUI_API ImFont* ImFontAtlas_AddFontFromFileTTF(ImFontAtlas* atlas,CONST char* filename, float size_pixels, CONST ImFontConfig* font_cfg, CONST ImWchar* glyph_ranges)
 {
-	return atlas->AddFontFromFileTTF(filename, size_pixels, font_cfg, glyph_ranges);
+    return atlas->AddFontFromFileTTF(filename, size_pixels, font_cfg, glyph_ranges);
 }
 
-CIMGUI_API ImFont* ImFontAtlas_AddFontFromMemoryTTF(ImFontAtlas* atlas, void* ttf_data, int ttf_size, float size_pixels, CONST ImFontConfig* font_cfg, CONST ImWchar* glyph_ranges)
+CIMGUI_API ImFont* ImFontAtlas_AddFontFromMemoryTTF(ImFontAtlas* atlas, void* font_data, int font_size, float size_pixels, CONST ImFontConfig* font_cfg, CONST ImWchar* glyph_ranges)
 {
-	return atlas->AddFontFromMemoryTTF(ttf_data, ttf_size, size_pixels, font_cfg, glyph_ranges);
+    return atlas->AddFontFromMemoryTTF(font_data, font_size, size_pixels, font_cfg, glyph_ranges);
 }
 
-CIMGUI_API ImFont* ImFontAtlas_AddFontFromMemoryCompressedTTF(ImFontAtlas* atlas, CONST void* compressed_ttf_data, int compressed_ttf_size, float size_pixels, CONST ImFontConfig* font_cfg, CONST ImWchar* glyph_ranges)
+CIMGUI_API ImFont* ImFontAtlas_AddFontFromMemoryCompressedTTF(ImFontAtlas* atlas, CONST void* compressed_font_data, int compressed_font_size, float size_pixels, CONST ImFontConfig* font_cfg, CONST ImWchar* glyph_ranges)
 {
-	return atlas->AddFontFromMemoryCompressedTTF(compressed_ttf_data, compressed_ttf_size, size_pixels, font_cfg, glyph_ranges);
+    return atlas->AddFontFromMemoryCompressedTTF(compressed_font_data, compressed_font_size, size_pixels, font_cfg, glyph_ranges);
 }
 
-CIMGUI_API ImFont* ImFontAtlas_AddFontFromMemoryCompressedBase85TTF(ImFontAtlas* atlas, CONST char* compressed_ttf_data_base85, float size_pixels, CONST ImFontConfig* font_cfg, CONST ImWchar* glyph_ranges)
+CIMGUI_API ImFont* ImFontAtlas_AddFontFromMemoryCompressedBase85TTF(ImFontAtlas* atlas, CONST char* compressed_font_data_base85, float size_pixels, CONST ImFontConfig* font_cfg, CONST ImWchar* glyph_ranges)
 {
-	return atlas->AddFontFromMemoryCompressedBase85TTF(compressed_ttf_data_base85, size_pixels, font_cfg, glyph_ranges);
+    return atlas->AddFontFromMemoryCompressedBase85TTF(compressed_font_data_base85, size_pixels, font_cfg, glyph_ranges);
 }
 
 CIMGUI_API void ImFontAtlas_ClearTexData(ImFontAtlas* atlas)
 {
-	return atlas->ClearTexData();
+    return atlas->ClearTexData();
+}
+
+CIMGUI_API void ImFontAtlas_ClearInputData(ImFontAtlas* atlas)
+{
+    return atlas->ClearInputData();
+}
+
+CIMGUI_API void ImFontAtlas_ClearFonts(ImFontAtlas* atlas)
+{
+    return atlas->ClearFonts();
 }
 
 CIMGUI_API void ImFontAtlas_Clear(ImFontAtlas* atlas)
 {
-	return atlas->Clear();
-}
+    return atlas->Clear();
+}
+
+CIMGUI_API CONST ImWchar* ImFontAtlas_GetGlyphRangesDefault(struct ImFontAtlas* atlas)
+{
+    return atlas->GetGlyphRangesDefault();
+}
+
+CIMGUI_API CONST ImWchar*   ImFontAtlas_GetGlyphRangesKorean(struct ImFontAtlas* atlas)
+{
+    return atlas->GetGlyphRangesKorean();
+}
+
+CIMGUI_API CONST ImWchar*   ImFontAtlas_GetGlyphRangesJapanese(struct ImFontAtlas* atlas)
+{
+    return atlas->GetGlyphRangesJapanese();
+}
+
+CIMGUI_API CONST ImWchar*   ImFontAtlas_GetGlyphRangesChinese(struct ImFontAtlas* atlas)
+{
+    return atlas->GetGlyphRangesChinese();
+}
+
+CIMGUI_API CONST ImWchar*   ImFontAtlas_GetGlyphRangesCyrillic(struct ImFontAtlas* atlas)
+{
+    return atlas->GetGlyphRangesCyrillic();
+}
+
+CIMGUI_API CONST ImWchar*   ImFontAtlas_GetGlyphRangesThai(struct ImFontAtlas* atlas)
+{
+    return atlas->GetGlyphRangesThai();
+}
+
+CIMGUI_API ImTextureID ImFontAtlas_GetTexID(struct ImFontAtlas* atlas)
+{
+    return atlas->TexID;
+}
+
+CIMGUI_API unsigned char* ImFontAtlas_GetTexPixelsAlpha8(struct ImFontAtlas* atlas)
+{
+    return atlas->TexPixelsAlpha8;
+}
+
+CIMGUI_API unsigned int* ImFontAtlas_GetTexPixelsRGBA32(struct ImFontAtlas* atlas)
+{
+    return atlas->TexPixelsRGBA32;
+}
+
+CIMGUI_API int ImFontAtlas_GetTexWidth(struct ImFontAtlas* atlas)
+{
+    return atlas->TexWidth;
+}
+
+CIMGUI_API int ImFontAtlas_GetTexHeight(struct ImFontAtlas* atlas)
+{
+    return atlas->TexHeight;
+}
+
+CIMGUI_API int ImFontAtlas_GetTexDesiredWidth(struct ImFontAtlas* atlas)
+{
+    return atlas->TexDesiredWidth;
+}
+
+CIMGUI_API void ImFontAtlas_SetTexDesiredWidth(struct ImFontAtlas* atlas, int TexDesiredWidth_)
+{
+    atlas->TexDesiredWidth = TexDesiredWidth_;
+}
+
+CIMGUI_API int ImFontAtlas_GetTexGlyphPadding(struct ImFontAtlas* atlas)
+{
+    return atlas->TexGlyphPadding;
+}
+
+CIMGUI_API void ImFontAtlas_SetTexGlyphPadding(struct ImFontAtlas* atlas, int TexGlyphPadding_)
+{
+    atlas->TexGlyphPadding = TexGlyphPadding_;
+}
+
+CIMGUI_API void ImFontAtlas_GetTexUvWhitePixel(struct ImFontAtlas* atlas, ImVec2* pOut)
+{
+    *pOut = atlas->TexUvWhitePixel;
+}
+
+// ImFontAtlas::Fonts;
+CIMGUI_API int ImFontAtlas_Fonts_size(struct ImFontAtlas* atlas)
+{
+    return atlas->Fonts.size();
+}
+
+CIMGUI_API ImFont* ImFontAtlas_Fonts_index(struct ImFontAtlas* atlas, int index)
+{
+    return atlas->Fonts[index];
+}
+
+// ImFont
+CIMGUI_API float ImFont_GetFontSize(const struct ImFont* font)
+{
+    return font->FontSize;
+}
+
+CIMGUI_API void ImFont_SetFontSize(struct ImFont* font, float FontSize_)
+{
+    font->FontSize = FontSize_;
+}
+
+CIMGUI_API float ImFont_GetScale(const struct ImFont* font)
+{
+    return font->Scale;
+}
+
+CIMGUI_API void ImFont_SetScale(struct ImFont* font, float Scale_)
+{
+    font->Scale = Scale_;
+}
+
+CIMGUI_API void ImFont_GetDisplayOffset(const struct ImFont* font, ImVec2* pOut)
+{
+    *pOut = font->DisplayOffset;
+}
+
+CIMGUI_API const struct IMFONTGLYPH* ImFont_GetFallbackGlyph(const struct ImFont* font)
+{
+    return font->FallbackGlyph;
+}
+
+CIMGUI_API void ImFont_SetFallbackGlyph(struct ImFont* font, const struct IMFONTGLYPH* FallbackGlyph_)
+{
+    font->FallbackGlyph = FallbackGlyph_;
+}
+
+CIMGUI_API float ImFont_GetFallbackAdvanceX(const struct ImFont* font)
+{
+    return font->FallbackAdvanceX;
+}
+
+CIMGUI_API ImWchar ImFont_GetFallbackChar(const struct ImFont* font)
+{
+    return font->FallbackChar;
+}
+
+CIMGUI_API short ImFont_GetConfigDataCount(const struct ImFont* font)
+{
+    return font->ConfigDataCount;
+}
+
+CIMGUI_API struct ImFontConfig* ImFont_GetConfigData(struct ImFont* font)
+{
+    return font->ConfigData;
+}
+
+CIMGUI_API struct ImFontAtlas* ImFont_GetContainerAtlas(struct ImFont* font)
+{
+    return font->ContainerAtlas;
+}
+
+CIMGUI_API float ImFont_GetAscent(const struct ImFont* font)
+{
+    return font->Ascent;
+}
+
+CIMGUI_API float ImFont_GetDescent(const struct ImFont* font)
+{
+    return font->Descent;
+}
+
+CIMGUI_API int ImFont_GetMetricsTotalSurface(const struct ImFont* font)
+{
+    return font->MetricsTotalSurface;
+}
+
+CIMGUI_API void ImFont_ClearOutputData(struct ImFont* font)
+{
+    font->ClearOutputData();
+}
+
+CIMGUI_API void ImFont_BuildLookupTable(struct ImFont* font)
+{
+    font->BuildLookupTable();
+}
+
+CIMGUI_API const struct IMFONTGLYPH* ImFont_FindGlyph(const struct ImFont* font, ImWchar c)
+{
+    return font->FindGlyph(c);
+}
+
+CIMGUI_API void ImFont_SetFallbackChar(struct ImFont* font, ImWchar c)
+{
+    font->SetFallbackChar(c);
+}
+
+CIMGUI_API float ImFont_GetCharAdvance(const struct ImFont* font, ImWchar c)
+{
+    return font->GetCharAdvance(c);
+}
+
+CIMGUI_API bool ImFont_IsLoaded(const struct ImFont* font)
+{
+    return font->IsLoaded();
+}
+
+CIMGUI_API void ImFont_CalcTextSizeA(const struct ImFont* font, ImVec2* pOut, float size, float max_width, float wrap_width, const char* text_begin, const char* text_end, const char** remaining)
+{
+    *pOut = font->CalcTextSizeA(size, max_width, wrap_width, text_begin, text_end, remaining);
+}
+
+CIMGUI_API const char* ImFont_CalcWordWrapPositionA(const struct ImFont* font, float scale, const char* text, const char* text_end, float wrap_width)
+{
+    return font->CalcWordWrapPositionA(scale, text, text_end, wrap_width);
+}
+
+CIMGUI_API void ImFont_RenderChar(const struct ImFont* font, ImDrawList* draw_list, float size, ImVec2 pos, ImU32 col, unsigned short c)
+{
+    return font->RenderChar(draw_list, size, pos, col, c);
+}
+
+CIMGUI_API void ImFont_RenderText(const struct ImFont* font, ImDrawList* draw_list, float size, ImVec2 pos, ImU32 col, const ImVec4* clip_rect, const char* text_begin, const char* text_end, float wrap_width, bool cpu_fine_clip)
+{
+    return font->RenderText(draw_list, size, pos, col, *clip_rect, text_begin, text_end, wrap_width, cpu_fine_clip);
+}
+
+// ImFont::Glyph
+CIMGUI_API int ImFont_Glyphs_size(const struct ImFont* font)
+{
+    return font->Glyphs.size();
+}
+
+CIMGUI_API struct IMFONTGLYPH* ImFont_Glyphs_index(struct ImFont* font, int index)
+{
+    return &font->Glyphs[index];
+}
+
+// ImFont::IndexXAdvance
+CIMGUI_API int ImFont_IndexXAdvance_size(const struct ImFont* font)
+{
+    return font->IndexAdvanceX.size();
+}
+
+CIMGUI_API float ImFont_IndexXAdvance_index(const struct ImFont* font, int index)
+{
+    return font->IndexAdvanceX[index];
+}
+
+// ImFont::IndexLookup
+CIMGUI_API int ImFont_IndexLookup_size(const struct ImFont* font)
+{
+    return font->IndexLookup.size();
+}
+
+CIMGUI_API unsigned short ImFont_IndexLookup_index(const struct ImFont* font, int index)
+{
+    return font->IndexLookup[index];
+}

cimgui/listClipper.cpp

@@ -0,0 +1,27 @@
+#include "../imgui/imgui.h"
+#include "cimgui.h"
+
+CIMGUI_API void ImGuiListClipper_Begin(ImGuiListClipper* clipper, int count, float items_height)
+{
+  clipper->Begin(count, items_height);
+}
+
+CIMGUI_API void ImGuiListClipper_End(ImGuiListClipper* clipper)
+{
+  clipper->End();
+}
+
+CIMGUI_API bool ImGuiListClipper_Step(ImGuiListClipper* clipper)
+{
+  return clipper->Step();
+}
+
+CIMGUI_API int ImGuiListClipper_GetDisplayStart(ImGuiListClipper* clipper)
+{
+  return clipper->DisplayStart;
+}
+
+CIMGUI_API int ImGuiListClipper_GetDisplayEnd(ImGuiListClipper* clipper)
+{
+  return clipper->DisplayEnd;
+}