diff --git a/.gitignore b/.gitignore index b8bd026..3e7f2af 100644 --- a/.gitignore +++ b/.gitignore @@ -26,3 +26,7 @@ *.exe *.out *.app +cimgui/Debug/ +cimgui/cimgui.opensdf +cimgui/cimgui.sdf +cimgui/cimgui.v12.suo diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..e3ede80 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "imgui"] + path = imgui + url = https://github.com/ocornut/imgui.git diff --git a/cimgui/cimgui.cpp b/cimgui/cimgui.cpp new file mode 100644 index 0000000..5911d18 --- /dev/null +++ b/cimgui/cimgui.cpp @@ -0,0 +1,45 @@ + +#include "../imgui/imgui.h" + +#define API __declspec(dllexport) + +extern "C" API ImGuiIO* ImGui_GetIO() +{ + return &ImGui::GetIO(); +} + +extern "C" API void ImGui_Shutdown() +{ + ImGui::Shutdown(); +} + +extern "C" API void ImGui_NewFrame() +{ + ImGui::NewFrame(); +} + +extern "C" API void ImGui_Render() +{ + ImGui::Render(); +} + +extern "C" API void ImGui_Text(const char* text) +{ + ImGui::Text(text); +} + +extern "C" API void ImGui_SliderFloat(const char* label, float* v, float v_min, float v_max, const char* display_format, float power) +{ + ImGui::SliderFloat(label,v,v_min,v_max,display_format,power); +} + +extern "C" API bool ImGui_Button(const char* label, const ImVec2& size, bool repeat_when_held) +{ + return ImGui::Button(label,size,repeat_when_held); +} + +extern "C" 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); +} + diff --git a/cimgui/cimgui.sln b/cimgui/cimgui.sln new file mode 100644 index 0000000..0331464 --- /dev/null +++ b/cimgui/cimgui.sln @@ -0,0 +1,22 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 2013 +VisualStudioVersion = 12.0.31101.0 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cimgui", "cimgui.vcxproj", "{EDE48926-0595-4488-B1A0-32CA71397271}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Win32 = Debug|Win32 + Release|Win32 = Release|Win32 + 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}.Release|Win32.ActiveCfg = Release|Win32 + {EDE48926-0595-4488-B1A0-32CA71397271}.Release|Win32.Build.0 = Release|Win32 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/cimgui/cimgui.vcxproj b/cimgui/cimgui.vcxproj new file mode 100644 index 0000000..21adeb0 --- /dev/null +++ b/cimgui/cimgui.vcxproj @@ -0,0 +1,85 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + + {EDE48926-0595-4488-B1A0-32CA71397271} + Win32Proj + cimgui + + + + DynamicLibrary + true + v120 + Unicode + + + DynamicLibrary + false + v120 + true + Unicode + + + + + + + + + + + + + true + + + false + + + + + + Level3 + Disabled + WIN32;_DEBUG;_WINDOWS;_USRDLL;CIMGUI_EXPORTS;%(PreprocessorDefinitions) + + + Windows + true + + + + + Level3 + + + MaxSpeed + true + true + WIN32;NDEBUG;_WINDOWS;_USRDLL;CIMGUI_EXPORTS;%(PreprocessorDefinitions) + + + Windows + true + true + true + + + + + + + + + + \ No newline at end of file diff --git a/cimgui/cimgui.vcxproj.filters b/cimgui/cimgui.vcxproj.filters new file mode 100644 index 0000000..503f5a4 --- /dev/null +++ b/cimgui/cimgui.vcxproj.filters @@ -0,0 +1,25 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hh;hpp;hxx;hm;inl;inc;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms + + + + + Source Files + + + Source Files + + + \ No newline at end of file diff --git a/imgui b/imgui new file mode 160000 index 0000000..3c6257b --- /dev/null +++ b/imgui @@ -0,0 +1 @@ +Subproject commit 3c6257b8b9f8cb4494add15af0b913341053cefa