From 036dce634e791e4e09c3e81d297be3c4fc592cd4 Mon Sep 17 00:00:00 2001 From: omar Date: Mon, 14 May 2018 17:59:12 +0200 Subject: [PATCH] Version 1.62 WIP --- CHANGELOG.txt | 8 ++++++++ imgui.cpp | 2 +- imgui.h | 4 ++-- imgui_demo.cpp | 2 +- imgui_draw.cpp | 2 +- imgui_internal.h | 2 +- misc/fonts/README.txt | 13 ++++++++++++- 7 files changed, 26 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 9f97d87a..c6993726 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -37,6 +37,14 @@ HOW TO UPDATE? ----------------------------------------------------------------------- +VERSION 1.62 WIP (IN PROGRESS) + +Breaking Changes: + +Other Changes: + +----------------------------------------------------------------------- + VERSION 1.61 (Released 2018-05-14) Breaking Changes: diff --git a/imgui.cpp b/imgui.cpp index 0e573294..2ef17af8 100644 --- a/imgui.cpp +++ b/imgui.cpp @@ -1,4 +1,4 @@ -// dear imgui, v1.61 +// dear imgui, v1.62 WIP // (main code and documentation) // Call and read ImGui::ShowDemoWindow() in imgui_demo.cpp for demo code. diff --git a/imgui.h b/imgui.h index 163aa3bd..6003b374 100644 --- a/imgui.h +++ b/imgui.h @@ -1,4 +1,4 @@ -// dear imgui, v1.61 +// dear imgui, v1.62 WIP // (headers) // See imgui.cpp file for documentation. @@ -22,7 +22,7 @@ #include // memset, memmove, memcpy, strlen, strchr, strcpy, strcmp // Version -#define IMGUI_VERSION "1.61" +#define IMGUI_VERSION "1.62 WIP" #define IMGUI_CHECKVERSION() ImGui::DebugCheckVersionAndDataLayout(IMGUI_VERSION, sizeof(ImGuiIO), sizeof(ImGuiStyle), sizeof(ImVec2), sizeof(ImVec4), sizeof(ImDrawVert)) // Define attributes of all API symbols declarations (e.g. for DLL under Windows) diff --git a/imgui_demo.cpp b/imgui_demo.cpp index fcff5065..da6a5c86 100644 --- a/imgui_demo.cpp +++ b/imgui_demo.cpp @@ -1,4 +1,4 @@ -// dear imgui, v1.61 +// dear imgui, v1.62 WIP // (demo code) // Message to the person tempted to delete this file when integrating ImGui into their code base: diff --git a/imgui_draw.cpp b/imgui_draw.cpp index 8ba9f098..59995c97 100644 --- a/imgui_draw.cpp +++ b/imgui_draw.cpp @@ -1,4 +1,4 @@ -// dear imgui, v1.61 +// dear imgui, v1.62 WIP // (drawing and font code) // Contains implementation for diff --git a/imgui_internal.h b/imgui_internal.h index 7ec9aa9a..ebc2b87f 100644 --- a/imgui_internal.h +++ b/imgui_internal.h @@ -1,4 +1,4 @@ -// dear imgui, v1.61 +// dear imgui, v1.62 WIP // (internals) // You may use this file to debug, understand or extend ImGui features but we don't provide any guarantee of forward compatibility! diff --git a/misc/fonts/README.txt b/misc/fonts/README.txt index 9ef6811e..cd51dd83 100644 --- a/misc/fonts/README.txt +++ b/misc/fonts/README.txt @@ -5,11 +5,12 @@ You may also load external .TTF/.OTF files. The files in this folder are suggested fonts, provided as a convenience. (Note: .OTF support in stb_truetype.h currently doesn't appear to load every font) -Fonts are rasterized in a single texture at the time of calling either of io.Fonts.GetTexDataAsAlpha8()/GetTexDataAsRGBA32()/Build(). +Fonts are rasterized in a single texture at the time of calling either of io.Fonts->GetTexDataAsAlpha8()/GetTexDataAsRGBA32()/Build(). Also read dear imgui FAQ in imgui.cpp! In this document: +- Readme First / FAQ - Using Icons - Fonts Loading Instructions - FreeType rasterizer, Small font sizes @@ -20,6 +21,16 @@ In this document: - Links, Other fonts +--------------------------------------- + README FIRST / FAQ +--------------------------------------- + + - You can use the style editor ImGui::ShowStyleEditor() to browse your fonts and understand what's going on if you have an issue. + - Make sure your font ranges data are persistent (available during the call to GetTexDataAsAlpha8()/GetTexDataAsRGBA32()/Build(). + - Use C++11 u8"my text" syntax to encode literal strings as UTF-8. + - If you want to include a backslash \ character in your string literal, you need to double them e.g. "folder\\filename". + + --------------------------------------- USING ICONS ---------------------------------------