zhangengru/tracy
1
0
Fork 0
mirror of https://github.com/wolfpld/tracy.git synced 2025-03-20 07:40:02 +08:00
Code Issues Projects Wiki Activity

Update to ImGui 1.65.

Browse Source
This commit is contained in:
Bartosz Taudul
2018-09-08 20:31:38 +02:00
parent 9d4bdf0c28
commit 9eb04ea817
12 changed files with 1023 additions and 887 deletions
Download Patch File Download Diff File Expand all files Collapse all files
profiler/build/win32/Tracy.vcxproj
+3 -3
View File
@@ -136,9 +136,9 @@
<ClInclude Include="..\..\..\imgui\imconfig.h" />
<ClInclude Include="..\..\..\imgui\imgui.h" />
<ClInclude Include="..\..\..\imgui\imgui_internal.h" />
<ClInclude Include="..\..\..\imgui\stb_rect_pack.h" />
<ClInclude Include="..\..\..\imgui\stb_textedit.h" />
<ClInclude Include="..\..\..\imgui\stb_truetype.h" />
<ClInclude Include="..\..\..\imgui\imstb_rectpack.h" />
<ClInclude Include="..\..\..\imgui\imstb_textedit.h" />
<ClInclude Include="..\..\..\imgui\imstb_truetype.h" />
<ClInclude Include="..\..\..\nfd\common.h" />
<ClInclude Include="..\..\..\nfd\nfd.h" />
<ClInclude Include="..\..\..\nfd\nfd_common.h" />
profiler/build/win32/Tracy.vcxproj.filters
+33 -33
View File
@@ -42,15 +42,6 @@
<ClCompile Include="..\..\src\main.cpp">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="..\..\..\imgui\imgui.cpp">
<Filter>imgui</Filter>
</ClCompile>
<ClCompile Include="..\..\..\imgui\imgui_demo.cpp">
<Filter>imgui</Filter>
</ClCompile>
<ClCompile Include="..\..\..\imgui\imgui_draw.cpp">
<Filter>imgui</Filter>
</ClCompile>
<ClCompile Include="..\..\libs\gl3w\GL\gl3w.c">
<Filter>gl3w</Filter>
</ClCompile>
@@ -90,6 +81,15 @@
<ClCompile Include="..\..\src\imgui_impl_opengl3.cpp">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="..\..\..\imgui\imgui.cpp">
<Filter>imgui</Filter>
</ClCompile>
<ClCompile Include="..\..\..\imgui\imgui_demo.cpp">
<Filter>imgui</Filter>
</ClCompile>
<ClCompile Include="..\..\..\imgui\imgui_draw.cpp">
<Filter>imgui</Filter>
</ClCompile>
<ClCompile Include="..\..\..\imgui\imgui_widgets.cpp">
<Filter>imgui</Filter>
</ClCompile>
@@ -122,24 +122,6 @@
<ClInclude Include="..\..\..\server\TracyView.hpp">
<Filter>server</Filter>
</ClInclude>
<ClInclude Include="..\..\..\imgui\imconfig.h">
<Filter>imgui</Filter>
</ClInclude>
<ClInclude Include="..\..\..\imgui\imgui.h">
<Filter>imgui</Filter>
</ClInclude>
<ClInclude Include="..\..\..\imgui\imgui_internal.h">
<Filter>imgui</Filter>
</ClInclude>
<ClInclude Include="..\..\..\imgui\stb_rect_pack.h">
<Filter>imgui</Filter>
</ClInclude>
<ClInclude Include="..\..\..\imgui\stb_textedit.h">
<Filter>imgui</Filter>
</ClInclude>
<ClInclude Include="..\..\..\imgui\stb_truetype.h">
<Filter>imgui</Filter>
</ClInclude>
<ClInclude Include="..\..\libs\gl3w\GL\gl3w.h">
<Filter>gl3w</Filter>
</ClInclude>
@@ -188,12 +170,6 @@
<ClInclude Include="..\..\..\common\TracyAlign.hpp">
<Filter>common</Filter>
</ClInclude>
<ClInclude Include="..\..\..\common\tracy_benaphore.h">
<Filter>imgui</Filter>
</ClInclude>
<ClInclude Include="..\..\..\common\tracy_sema.h">
<Filter>imgui</Filter>
</ClInclude>
<ClInclude Include="..\..\..\server\TracyFileHeader.hpp">
<Filter>server</Filter>
</ClInclude>
@@ -251,6 +227,30 @@
<ClInclude Include="..\..\src\imgui_impl_opengl3.h">
<Filter>src</Filter>
</ClInclude>
<ClInclude Include="..\..\..\common\tracy_benaphore.h">
<Filter>common</Filter>
</ClInclude>
<ClInclude Include="..\..\..\common\tracy_sema.h">
<Filter>common</Filter>
</ClInclude>
<ClInclude Include="..\..\..\imgui\imconfig.h">
<Filter>imgui</Filter>
</ClInclude>
<ClInclude Include="..\..\..\imgui\imgui.h">
<Filter>imgui</Filter>
</ClInclude>
<ClInclude Include="..\..\..\imgui\imgui_internal.h">
<Filter>imgui</Filter>
</ClInclude>
<ClInclude Include="..\..\..\imgui\imstb_rectpack.h">
<Filter>imgui</Filter>
</ClInclude>
<ClInclude Include="..\..\..\imgui\imstb_textedit.h">
<Filter>imgui</Filter>
</ClInclude>
<ClInclude Include="..\..\..\imgui\imstb_truetype.h">
<Filter>imgui</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<Natvis Include="DebugVis.natvis" />
profiler/src/imgui_freetype.cpp
+1 -1
View File
@@ -244,7 +244,7 @@ namespace
#define STBRP_ASSERT(x) IM_ASSERT(x)
#define STBRP_STATIC
#define STB_RECT_PACK_IMPLEMENTATION
#include "stb_rect_pack.h"
#include "imstb_rectpack.h"
bool ImGuiFreeType::BuildFontAtlas(ImFontAtlas* atlas, unsigned int extra_flags)
{