mirror/tracy
1
0
Fork 0
mirror of https://github.com/wolfpld/tracy.git synced 2024-11-10 02:31:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update to imgui 1.64.

Browse Source
This commit is contained in:
Bartosz Taudul 2018-08-31 18:37:29 +02:00
parent 0d6d296e94
commit fca71e6e0d
8 changed files with 7590 additions and 7260 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9272
imgui/imgui.cpp
View File

File diff suppressed because it is too large Load Diff

6
imgui/imgui.h
View File

@ -1,4 +1,4 @@
// dear imgui, v1.63 // dear imgui, v1.64
// (headers) // (headers)
// See imgui.cpp file for documentation. // See imgui.cpp file for documentation.
@ -23,8 +23,8 @@
// Version // Version
// (Integer encoded as XYYZZ for use in #if preprocessor conditionals. Work in progress versions typically starts at XYY00 then bounced up to XYY01 when release tagging happens) // (Integer encoded as XYYZZ for use in #if preprocessor conditionals. Work in progress versions typically starts at XYY00 then bounced up to XYY01 when release tagging happens)
#define IMGUI_VERSION "1.63" #define IMGUI_VERSION "1.64"
#define IMGUI_VERSION_NUM 16301 #define IMGUI_VERSION_NUM 16401
#define IMGUI_CHECKVERSION() ImGui::DebugCheckVersionAndDataLayout(IMGUI_VERSION, sizeof(ImGuiIO), sizeof(ImGuiStyle), sizeof(ImVec2), sizeof(ImVec4), sizeof(ImDrawVert)) #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) // Define attributes of all API symbols declarations (e.g. for DLL under Windows)

2
imgui/imgui_demo.cpp
View File

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

25
imgui/imgui_draw.cpp
View File

@ -1,14 +1,21 @@
// dear imgui, v1.63 // dear imgui, v1.64
// (drawing and font code) // (drawing and font code)
// Contains implementation for /*
// - Default styles
// - ImDrawList Index of this file:
// - ImDrawData - Cruft for stb_truetype/stb_rectpack implementation
// - ImFontAtlas - Style functions (default style)
// - Internal Render Helpers - ImDrawList
// - ImFont - ImDrawData
// - Default font data - ShadeVertsXXX helpers functions
- ImFontConfig
- ImFontAtlas
- ImFont
- Internal Render Helpers
- Default font data
*/
#if defined(_MSC_VER) && !defined(_CRT_SECURE_NO_WARNINGS) #if defined(_MSC_VER) && !defined(_CRT_SECURE_NO_WARNINGS)
#define _CRT_SECURE_NO_WARNINGS #define _CRT_SECURE_NO_WARNINGS

5
imgui/imgui_internal.h
View File

@ -1,4 +1,4 @@
// dear imgui, v1.63 // dear imgui, v1.64
// (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!
@ -1137,8 +1137,9 @@ namespace ImGui
// Settings // Settings
IMGUI_API void MarkIniSettingsDirty(); IMGUI_API void MarkIniSettingsDirty();
IMGUI_API void MarkIniSettingsDirty(ImGuiWindow* window); IMGUI_API void MarkIniSettingsDirty(ImGuiWindow* window);
IMGUI_API ImGuiSettingsHandler* FindSettingsHandler(const char* type_name); IMGUI_API ImGuiWindowSettings* CreateNewWindowSettings(const char* name);
IMGUI_API ImGuiWindowSettings* FindWindowSettings(ImGuiID id); IMGUI_API ImGuiWindowSettings* FindWindowSettings(ImGuiID id);
IMGUI_API ImGuiSettingsHandler* FindSettingsHandler(const char* type_name);
// Basic Accessors // Basic Accessors
inline ImGuiID GetItemID() { ImGuiContext& g = *GImGui; return g.CurrentWindow->DC.LastItemId; } inline ImGuiID GetItemID() { ImGuiContext& g = *GImGui; return g.CurrentWindow->DC.LastItemId; }

5536
imgui/imgui_widgets.cpp Normal file
View File

File diff suppressed because it is too large Load Diff

1
profiler/build/win32/Tracy.vcxproj
View File

@ -101,6 +101,7 @@
<ClCompile Include="..\..\..\imgui\imgui.cpp" /> <ClCompile Include="..\..\..\imgui\imgui.cpp" />
<ClCompile Include="..\..\..\imgui\imgui_demo.cpp" /> <ClCompile Include="..\..\..\imgui\imgui_demo.cpp" />
<ClCompile Include="..\..\..\imgui\imgui_draw.cpp" /> <ClCompile Include="..\..\..\imgui\imgui_draw.cpp" />
<ClCompile Include="..\..\..\imgui\imgui_widgets.cpp" />
<ClCompile Include="..\..\..\nfd\nfd_common.c" /> <ClCompile Include="..\..\..\nfd\nfd_common.c" />
<ClCompile Include="..\..\..\nfd\nfd_win.cpp" /> <ClCompile Include="..\..\..\nfd\nfd_win.cpp" />
<ClCompile Include="..\..\..\server\TracyBadVersion.cpp" /> <ClCompile Include="..\..\..\server\TracyBadVersion.cpp" />

3
profiler/build/win32/Tracy.vcxproj.filters
View File

@ -90,6 +90,9 @@
<ClCompile Include="..\..\src\imgui_impl_opengl3.cpp"> <ClCompile Include="..\..\src\imgui_impl_opengl3.cpp">
<Filter>src</Filter> <Filter>src</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\..\imgui\imgui_widgets.cpp">
<Filter>imgui</Filter>
</ClCompile>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="..\..\..\common\tracy_lz4.hpp"> <ClInclude Include="..\..\..\common\tracy_lz4.hpp">