diff options
author | Max Danielsson <max@autious.net> | 2022-04-27 22:37:34 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-04-27 22:37:34 +0300 |
commit | bb8e0756a8d235a60037ed57706aac226d4ca720 (patch) | |
tree | 08ba046b147298d06e67ba8ebf6d8f20f2c783ce | |
parent | 85129c3ac7ac5e723efb084675505ac38ce64072 (diff) | |
parent | 63776de24a2a1ca754cd8b80ac7c3428e60287e6 (diff) |
Merge pull request #39 from feliwir/imgui-freetype
Use ImGui freetype rasterizer
-rw-r--r-- | Projects/CMakeLists.txt | 1 | ||||
-rw-r--r-- | Source/GUI/dimgui/dimgui_impl.cpp | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/Projects/CMakeLists.txt b/Projects/CMakeLists.txt index 04435546..fd81c15b 100644 --- a/Projects/CMakeLists.txt +++ b/Projects/CMakeLists.txt @@ -651,6 +651,7 @@ INCLUDE_DIRECTORIES( ${SRCDIR} ${LIBDIR} ${LIBDIR}/imgui-1.85 + ${LIBDIR}/imgui-1.85/misc/freetype ${LIBDIR}/ovr_sdk_win_1.12.0_public/OculusSDK/LibOVR/Include ${LIBDIR}/openvr-master/headers ${LIBDIR}/glm-0.9.4.2/ diff --git a/Source/GUI/dimgui/dimgui_impl.cpp b/Source/GUI/dimgui/dimgui_impl.cpp index 8f47d4b0..849e0875 100644 --- a/Source/GUI/dimgui/dimgui_impl.cpp +++ b/Source/GUI/dimgui/dimgui_impl.cpp @@ -23,6 +23,7 @@ // limitations under the License. // //----------------------------------------------------------------------------- +#define IMGUI_ENABLE_FREETYPE #include <imgui.cpp> #include <imgui_demo.cpp> #include <imgui_draw.cpp> @@ -31,3 +32,4 @@ #include <imgui_color_picker.cpp> #include <implot.cpp> #include <implot_items.cpp> +#include <imgui_freetype.cpp>
\ No newline at end of file |