Drezil/imgui
1
0
Fork 0
mirror of https://github.com/Drezil/imgui.git synced 2024-11-15 01:17:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Version 1.75 WIP

Browse Source 
Added message to font file loading assert.
This commit is contained in:
omar 2019-11-28 20:58:16 +01:00
parent bf6d1ba3d1
commit abaf0256b8
8 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
docs/CHANGELOG.txt
View File

@ -29,6 +29,11 @@ HOW TO UPDATE?
- Please report any issue! - Please report any issue!
-----------------------------------------------------------------------
VERSION 1.75 WIP (In Progress)
-----------------------------------------------------------------------
----------------------------------------------------------------------- -----------------------------------------------------------------------
VERSION 1.74 (Released 2019-11-25) VERSION 1.74 (Released 2019-11-25)
----------------------------------------------------------------------- -----------------------------------------------------------------------

2
examples/README.txt
View File

@ -1,5 +1,5 @@
----------------------------------------------------------------------- -----------------------------------------------------------------------
dear imgui, v1.74 dear imgui, v1.75 WIP
----------------------------------------------------------------------- -----------------------------------------------------------------------
examples/README.txt examples/README.txt
(This is the README file for the examples/ folder. See docs/ for more documentation) (This is the README file for the examples/ folder. See docs/ for more documentation)

2
imgui.cpp
View File

@ -1,4 +1,4 @@
// dear imgui, v1.74 // dear imgui, v1.75 WIP
// (main code and documentation) // (main code and documentation)
// Call and read ImGui::ShowDemoWindow() in imgui_demo.cpp for demo code. // Call and read ImGui::ShowDemoWindow() in imgui_demo.cpp for demo code.

6
imgui.h
View File

@ -1,4 +1,4 @@
// dear imgui, v1.74 // dear imgui, v1.75 WIP
// (headers) // (headers)
// See imgui.cpp file for documentation. // See imgui.cpp file for documentation.
@ -47,8 +47,8 @@ Index of this file:
// Version // Version
// (Integer encoded as XYYZZ for use in #if preprocessor conditionals. Work in progress versions typically starts at XYY99 then bounce up to XYY00, XYY01 etc. when release tagging happens) // (Integer encoded as XYYZZ for use in #if preprocessor conditionals. Work in progress versions typically starts at XYY99 then bounce up to XYY00, XYY01 etc. when release tagging happens)
#define IMGUI_VERSION "1.74" #define IMGUI_VERSION "1.75 WIP"
#define IMGUI_VERSION_NUM 17400 #define IMGUI_VERSION_NUM 17401
#define IMGUI_CHECKVERSION() ImGui::DebugCheckVersionAndDataLayout(IMGUI_VERSION, sizeof(ImGuiIO), sizeof(ImGuiStyle), sizeof(ImVec2), sizeof(ImVec4), sizeof(ImDrawVert), sizeof(ImDrawIdx)) #define IMGUI_CHECKVERSION() ImGui::DebugCheckVersionAndDataLayout(IMGUI_VERSION, sizeof(ImGuiIO), sizeof(ImGuiStyle), sizeof(ImVec2), sizeof(ImVec4), sizeof(ImDrawVert), sizeof(ImDrawIdx))
// Define attributes of all API symbols declarations (e.g. for DLL under Windows) // Define attributes of all API symbols declarations (e.g. for DLL under Windows)

2
imgui_demo.cpp
View File

@ -1,4 +1,4 @@
// dear imgui, v1.74 // dear imgui, v1.75 WIP
// (demo code) // (demo code)
// Message to the person tempted to delete this file when integrating Dear ImGui into their code base: // Message to the person tempted to delete this file when integrating Dear ImGui into their code base:

4
imgui_draw.cpp
View File

@ -1,4 +1,4 @@
// dear imgui, v1.74 // dear imgui, v1.75 WIP
// (drawing and font code) // (drawing and font code)
/* /*
@ -1673,7 +1673,7 @@ ImFont* ImFontAtlas::AddFontFromFileTTF(const char* filename, float size_pixels,
void* data = ImFileLoadToMemory(filename, "rb", &data_size, 0); void* data = ImFileLoadToMemory(filename, "rb", &data_size, 0);
if (!data) if (!data)
{ {
IM_ASSERT(0); // Could not load file. IM_ASSERT_USER_ERROR(0, "Could not font load file.");
return NULL; return NULL;
} }
ImFontConfig font_cfg = font_cfg_template ? *font_cfg_template : ImFontConfig(); ImFontConfig font_cfg = font_cfg_template ? *font_cfg_template : ImFontConfig();

4
imgui_internal.h
View File

@ -1,4 +1,4 @@
// dear imgui, v1.74 // dear imgui, v1.75 WIP
// (internal structures/api) // (internal structures/api)
// You may use this file to debug, understand or extend ImGui features but we don't provide any guarantee of forward compatibility! // You may use this file to debug, understand or extend ImGui features but we don't provide any guarantee of forward compatibility!
@ -166,7 +166,7 @@ extern IMGUI_API ImGuiContext* GImGui; // Current implicit context pointer
// Error handling // Error handling
// Down the line in some frameworks/languages we would like to have a way to redirect those to the programmer and recover from more faults. // Down the line in some frameworks/languages we would like to have a way to redirect those to the programmer and recover from more faults.
#ifndef IM_ASSERT_USER_ERROR #ifndef IM_ASSERT_USER_ERROR
#define IM_ASSERT_USER_ERROR(_EXP,_MSG) IM_ASSERT((_EXP) && (_MSG)) // Recoverable User Error #define IM_ASSERT_USER_ERROR(_EXP,_MSG) IM_ASSERT((_EXP) && _MSG) // Recoverable User Error
#endif #endif
// Misc Macros // Misc Macros

2
imgui_widgets.cpp
View File

@ -1,4 +1,4 @@
// dear imgui, v1.74 // dear imgui, v1.75 WIP
// (widgets code) // (widgets code)
/* /*