Merge pull request #8 from yannick/master

Fix Makefile: link ../imgui/imgui_draw.o ../imgui/imgui_demo.o

README.md

@@ -8,12 +8,12 @@ Most of the functions have wrapper counterparts now, missing stuff is added on a
 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.42 of imgui](https://github.com/ocornut/imgui/releases/tag/v1.42)
+* currently this wrapper is based on version [1.44 of imgui](https://github.com/ocornut/imgui/releases/tag/v1.44)
 * 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
 
 * clone
-* make using makefile on linux/osx (linux makefile not tested)
-* 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_`
+* 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)

cimgui/Makefile

@@ -7,6 +7,8 @@ OBJS += fontAtlas.o
 OBJS += drawList.o
 #OBJS += test.o
 OBJS += ../imgui/imgui.o
+OBJS += ../imgui/imgui_draw.o
+OBJS += ../imgui/imgui_demo.o
 
 UNAME_S := $(shell uname -s)
 
@@ -40,4 +42,4 @@ imgui_example:$(OBJS)
 	$(CXX) -o $(OUTPUTNAME) $(OBJS) $(CXXFLAGS) $(LINKFLAGS)
 
 clean:
-	rm $(OBJS)
+	rm $(OBJS)

cimgui/cimgui.cpp

@@ -84,6 +84,11 @@ CIMGUI_API void igGetContentRegionMax(ImVec2* out)
     *out = ImGui::GetContentRegionMax();
 }
 
+CIMGUI_API void	igGetContentRegionAvail(struct ImVec2* out)
+{
+	*out = ImGui::GetContentRegionAvail();
+}
+
 CIMGUI_API void igGetWindowContentRegionMin(ImVec2* out)
 {
     *out = ImGui::GetWindowContentRegionMin();

cimgui/cimgui.h

@@ -41,6 +41,7 @@ CIMGUI_API bool             igBeginChild(CONST char* str_id, CONST struct ImVec2
 CIMGUI_API bool             igBeginChildEx(ImGuiID id, CONST struct ImVec2 size, bool border, ImGuiWindowFlags extra_flags);
 CIMGUI_API void             igEndChild();
 CIMGUI_API void             igGetContentRegionMax(struct ImVec2* out);
+CIMGUI_API void             igGetContentRegionAvail(struct ImVec2* out);
 CIMGUI_API void             igGetWindowContentRegionMin(struct ImVec2* out);
 CIMGUI_API void             igGetWindowContentRegionMax(struct ImVec2* out);
 CIMGUI_API ImDrawList*      igGetWindowDrawList();
@@ -335,6 +336,7 @@ CIMGUI_API ImFont*          ImFontAtlas_AddFontDefault(ImFontAtlas* atlas, CONST
 CIMGUI_API ImFont*          ImFontAtlas_AddFontFromFileTTF(ImFontAtlas* atlas, CONST char* filename, float size_pixels, CONST ImFontConfig* font_cfg, CONST ImWchar* 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_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_AddFontFromMemoryCompressedBase85TTF(ImFontAtlas* atlas, CONST char* compressed_ttf_data_base85, float size_pixels, CONST ImFontConfig* font_cfg, CONST ImWchar* glyph_ranges);
 CIMGUI_API void             ImFontAtlas_ClearTexData(ImFontAtlas* atlas);
 CIMGUI_API void             ImFontAtlas_Clear(ImFontAtlas* atlas);
 

cimgui/cimgui.vcxproj

@@ -77,11 +77,14 @@
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="..\imgui\imgui.cpp" />
+    <ClCompile Include="..\imgui\imgui_demo.cpp" />
+    <ClCompile Include="..\imgui\imgui_draw.cpp" />
     <ClCompile Include="cimgui.cpp" />
     <ClCompile Include="drawList.cpp" />
     <ClCompile Include="fontAtlas.cpp" />
   </ItemGroup>
   <ItemGroup>
+    <ClInclude Include="..\imgui\imgui_internal.h" />
     <ClInclude Include="cimgui.h" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

cimgui/cimgui.vcxproj.filters

@@ -27,10 +27,19 @@
     <ClCompile Include="drawList.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\imgui\imgui_draw.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\imgui\imgui_demo.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="cimgui.h">
       <Filter>Source Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\imgui\imgui_internal.h">
+      <Filter>Source Files</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>

cimgui/fontAtlas.cpp

@@ -42,6 +42,11 @@ CIMGUI_API ImFont* ImFontAtlas_AddFontFromMemoryCompressedTTF(ImFontAtlas* atlas
 	return atlas->AddFontFromMemoryCompressedTTF(compressed_ttf_data, compressed_ttf_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)
+{
+	return atlas->AddFontFromMemoryCompressedBase85TTF(compressed_ttf_data_base85, size_pixels, font_cfg, glyph_ranges);
+}
+
 CIMGUI_API void ImFontAtlas_ClearTexData(ImFontAtlas* atlas)
 {
 	return atlas->ClearTexData();